From 6b2f3d05d51d7aabe8a00dac10f9dfc3d96134a9 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 27 Jan 2022 12:24:38 +0000
Subject: [PATCH 001/174] initial

---
 lnbits/extensions/diagonalley/README.md       |   9 +
 lnbits/extensions/diagonalley/__init__.py     |  16 +
 lnbits/extensions/diagonalley/config.json     |   6 +
 lnbits/extensions/diagonalley/crud.py         | 395 +++++++++
 lnbits/extensions/diagonalley/migrations.py   |  69 ++
 lnbits/extensions/diagonalley/models.py       |  57 ++
 .../extensions/diagonalley/static/js/index.js | 824 ++++++++++++++++++
 lnbits/extensions/diagonalley/tasks.py        |  29 +
 .../templates/diagonalley/_api_docs.html      | 129 +++
 .../templates/diagonalley/index.html          | 634 ++++++++++++++
 .../templates/diagonalley/stall.html          |   9 +
 lnbits/extensions/diagonalley/views.py        |  44 +
 lnbits/extensions/diagonalley/views_api.py    | 348 ++++++++
 13 files changed, 2569 insertions(+)
 create mode 100644 lnbits/extensions/diagonalley/README.md
 create mode 100644 lnbits/extensions/diagonalley/__init__.py
 create mode 100644 lnbits/extensions/diagonalley/config.json
 create mode 100644 lnbits/extensions/diagonalley/crud.py
 create mode 100644 lnbits/extensions/diagonalley/migrations.py
 create mode 100644 lnbits/extensions/diagonalley/models.py
 create mode 100644 lnbits/extensions/diagonalley/static/js/index.js
 create mode 100644 lnbits/extensions/diagonalley/tasks.py
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/index.html
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/stall.html
 create mode 100644 lnbits/extensions/diagonalley/views.py
 create mode 100644 lnbits/extensions/diagonalley/views_api.py

diff --git a/lnbits/extensions/diagonalley/README.md b/lnbits/extensions/diagonalley/README.md
new file mode 100644
index 00000000..e8035b74
--- /dev/null
+++ b/lnbits/extensions/diagonalley/README.md
@@ -0,0 +1,9 @@
+<h1>Diagon Alley</h1>
+<h2>A movable market stand</h2>
+Make a list of products to sell, point the list to an relay (or many), stack sats.
+Diagon Alley is a movable market stand, for anon transactions. You then give permission for an relay to list those products. Delivery addresses are sent through the Lightning Network.
+<img src="https://i.imgur.com/P1tvBSG.png">
+
+<h2>API endpoints</h2>
+
+<code>curl -X GET http://YOUR-TOR-ADDRESS</code>
diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
new file mode 100644
index 00000000..720c55c8
--- /dev/null
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -0,0 +1,16 @@
+from quart import Blueprint
+from lnbits.db import Database
+
+db = Database("ext_diagonalley")
+
+diagonalley_ext: Blueprint = Blueprint(
+    "diagonalley", __name__, static_folder="static", template_folder="templates"
+)
+
+from .views_api import *  # noqa
+from .views import *  # noqa
+
+from .tasks import register_listeners
+from lnbits.tasks import record_async
+
+diagonalley_ext.record(record_async(register_listeners))
diff --git a/lnbits/extensions/diagonalley/config.json b/lnbits/extensions/diagonalley/config.json
new file mode 100644
index 00000000..99e92e9b
--- /dev/null
+++ b/lnbits/extensions/diagonalley/config.json
@@ -0,0 +1,6 @@
+{
+    "name": "Diagon Alley",
+    "short_description": "Movable anonymous market stand",
+    "icon": "add_shopping_cart",
+    "contributors": ["benarc","DeanH"]
+}
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
new file mode 100644
index 00000000..c6ce8222
--- /dev/null
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -0,0 +1,395 @@
+from base64 import urlsafe_b64encode
+from uuid import uuid4
+from typing import List, Optional, Union
+
+from lnbits.settings import WALLET
+
+# from lnbits.db import open_ext_db
+from lnbits.db import SQLITE
+from . import db
+from .models import Products, Orders, Stalls, Zones
+
+import httpx
+from lnbits.helpers import urlsafe_short_hash
+import re
+
+regex = re.compile(
+    r"^(?:http|ftp)s?://"  # http:// or https://
+    r"(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|"
+    r"localhost|"
+    r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})"
+    r"(?::\d+)?"
+    r"(?:/?|[/?]\S+)$",
+    re.IGNORECASE,
+)
+
+
+###Products
+
+
+async def create_diagonalley_product(
+    *,
+    stall_id: str,
+    product: str,
+    categories: str,
+    description: str,
+    image: Optional[str] = None,
+    price: int,
+    quantity: int,
+    shippingzones: str,
+) -> Products:
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
+    product_id = urlsafe_short_hash()
+    # with open_ext_db("diagonalley") as db:
+    result = await (method)(
+        f"""
+        INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity, shippingzones)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+        {returning}
+        """,
+        (
+            product_id,
+            stall_id,
+            product,
+            categories,
+            description,
+            image,
+            price,
+            quantity,
+        ),
+    )
+    product = await get_diagonalley_product(product_id)
+    assert product, "Newly created product couldn't be retrieved"
+    return product
+
+
+async def update_diagonalley_product(product_id: str, **kwargs) -> Optional[Stalls]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+
+    # with open_ext_db("diagonalley") as db:
+    await db.execute(
+        f"UPDATE diagonalley.products SET {q} WHERE id = ?",
+        (*kwargs.values(), product_id),
+    )
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
+    )
+
+    return get_diagonalley_stall(product_id)
+
+
+async def get_diagonalley_product(product_id: str) -> Optional[Products]:
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
+    )
+    return Products.from_row(row) if row else None
+
+
+async def get_diagonalley_products(wallet_ids: Union[str, List[str]]) -> List[Products]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+
+    # with open_ext_db("diagonalley") as db:
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"""
+        SELECT * FROM diagonalley.products WHERE stall IN ({q})
+        """,
+        (*wallet_ids,),
+    )
+    return [Products.from_row(row) for row in rows]
+
+
+async def delete_diagonalley_product(product_id: str) -> None:
+    await db.execute("DELETE FROM diagonalley.products WHERE id = ?", (product_id,))
+
+
+###zones
+
+
+async def create_diagonalley_zone(
+    *,
+    wallet: Optional[str] = None,
+    cost: Optional[int] = 0,
+    countries: Optional[str] = None,
+) -> Zones:
+
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
+
+    zone_id = urlsafe_short_hash()
+    result = await (method)(
+        f"""
+        INSERT INTO diagonalley.zones (
+            id,
+            wallet,
+            cost,
+            countries
+
+        )
+        VALUES (?, ?, ?, ?)
+        {returning}
+        """,
+        (zone_id, wallet, cost, countries),
+    )
+
+    zone = await get_diagonalley_zone(zone_id)
+    assert zone, "Newly created zone couldn't be retrieved"
+    return zone
+
+
+async def update_diagonalley_zone(zone_id: str, **kwargs) -> Optional[Zones]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+    await db.execute(
+        f"UPDATE diagonalley.zones SET {q} WHERE id = ?",
+        (*kwargs.values(), zone_id),
+    )
+    row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
+    return Zones.from_row(row) if row else None
+
+
+async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
+    row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
+    return Zones.from_row(row) if row else None
+
+
+async def get_diagonalley_zones(wallet_ids: Union[str, List[str]]) -> List[Zones]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+        print(wallet_ids)
+
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+
+    for r in rows:
+        try:
+            x = httpx.get(r["zoneaddress"] + "/" + r["ratingkey"])
+            if x.status_code == 200:
+                await db.execute(
+                    "UPDATE diagonalley.zones SET online = ? WHERE id = ?",
+                    (
+                        True,
+                        r["id"],
+                    ),
+                )
+            else:
+                await db.execute(
+                    "UPDATE diagonalley.zones SET online = ? WHERE id = ?",
+                    (
+                        False,
+                        r["id"],
+                    ),
+                )
+        except:
+            print("An exception occurred")
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+    return [Zones.from_row(row) for row in rows]
+
+
+async def delete_diagonalley_zone(zone_id: str) -> None:
+    await db.execute("DELETE FROM diagonalley.zones WHERE id = ?", (zone_id,))
+
+
+###Stalls
+
+
+async def create_diagonalley_stall(
+    *,
+    wallet: str,
+    name: str,
+    publickey: str,
+    privatekey: str,
+    relays: str,
+    shippingzones: str,
+) -> Stalls:
+
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
+
+    stall_id = urlsafe_short_hash()
+    result = await (method)(
+        f"""
+        INSERT INTO diagonalley.stalls (
+            id,
+            wallet,
+            name,
+            publickey,
+            privatekey,
+            relays,
+            shippingzones
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+        {returning}
+        """,
+        (stall_id, wallet, name, publickey, privatekey, relays, shippingzones),
+    )
+
+    stall = await get_diagonalley_stall(stall_id)
+    assert stall, "Newly created stall couldn't be retrieved"
+    return stall
+
+
+async def update_diagonalley_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+    await db.execute(
+        f"UPDATE diagonalley.stalls SET {q} WHERE id = ?",
+        (*kwargs.values(), stall_id),
+    )
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+    )
+    return Stalls.from_row(row) if row else None
+
+
+async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
+    roww = await db.fetchone(
+        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+    )
+
+    try:
+        x = httpx.get(roww["stalladdress"] + "/" + roww["ratingkey"])
+        if x.status_code == 200:
+            await db.execute(
+                "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
+                (
+                    True,
+                    stall_id,
+                ),
+            )
+        else:
+            await db.execute(
+                "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
+                (
+                    False,
+                    stall_id,
+                ),
+            )
+    except:
+        print("An exception occurred")
+
+    # with open_ext_db("diagonalley") as db:
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+    )
+    return Stalls.from_row(row) if row else None
+
+
+async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+
+    for r in rows:
+        try:
+            x = httpx.get(r["stalladdress"] + "/" + r["ratingkey"])
+            if x.status_code == 200:
+                await db.execute(
+                    "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
+                    (
+                        True,
+                        r["id"],
+                    ),
+                )
+            else:
+                await db.execute(
+                    "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
+                    (
+                        False,
+                        r["id"],
+                    ),
+                )
+        except:
+            print("An exception occurred")
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+    return [Stalls.from_row(row) for row in rows]
+
+
+async def delete_diagonalley_stall(stall_id: str) -> None:
+    await db.execute("DELETE FROM diagonalley.stalls WHERE id = ?", (stall_id,))
+
+
+###Orders
+
+
+async def create_diagonalley_order(
+    *,
+    productid: str,
+    wallet: str,
+    product: str,
+    quantity: int,
+    shippingzone: str,
+    address: str,
+    email: str,
+    invoiceid: str,
+    paid: bool,
+    shipped: bool,
+) -> Orders:
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
+
+    order_id = urlsafe_short_hash()
+    result = await (method)(
+        f"""
+            INSERT INTO diagonalley.orders (id, productid, wallet, product,
+            quantity, shippingzone, address, email, invoiceid, paid, shipped)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            {returning}
+            """,
+        (
+            order_id,
+            productid,
+            wallet,
+            product,
+            quantity,
+            shippingzone,
+            address,
+            email,
+            invoiceid,
+            False,
+            False,
+        ),
+    )
+    if db.type == SQLITE:
+        order_id = result._result_proxy.lastrowid
+    else:
+        order_id = result[0]
+
+    link = await get_diagonalley_order(order_id)
+    assert link, "Newly created link couldn't be retrieved"
+    return link
+
+
+async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
+    )
+    return Orders.from_row(row) if row else None
+
+
+async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+    #
+    return [Orders.from_row(row) for row in rows]
+
+
+async def delete_diagonalley_order(order_id: str) -> None:
+    await db.execute("DELETE FROM diagonalley.orders WHERE id = ?", (order_id,))
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
new file mode 100644
index 00000000..1523f398
--- /dev/null
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -0,0 +1,69 @@
+async def m001_initial(db):
+    """
+    Initial products table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.products (
+            id TEXT PRIMARY KEY,
+            stall TEXT NOT NULL,
+            product TEXT NOT NULL,
+            categories TEXT NOT NULL,
+            description TEXT NOT NULL,
+            image TEXT NOT NULL,
+            price INTEGER NOT NULL,
+            quantity INTEGER NOT NULL
+        );
+    """
+    )
+
+    """
+    Initial stalls table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.stalls (
+            id TEXT PRIMARY KEY,
+            wallet TEXT NOT NULL,
+            name TEXT NOT NULL,
+            publickey TEXT NOT NULL,
+            privatekey TEXT NOT NULL,
+            relays TEXT NOT NULL
+        );
+    """
+    )
+
+    """
+    Initial zones table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.zones (
+            id TEXT PRIMARY KEY,
+            wallet TEXT NOT NULL,
+            cost TEXT NOT NULL,
+            countries TEXT NOT NULL
+        );
+    """
+    )
+
+    """
+    Initial orders table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.orders (
+            id TEXT PRIMARY KEY,
+            productid TEXT NOT NULL,
+            wallet TEXT NOT NULL,
+            product TEXT NOT NULL,
+            quantity INTEGER NOT NULL,
+            shippingzone INTEGER NOT NULL,
+            address TEXT NOT NULL,
+            email TEXT NOT NULL,
+            invoiceid TEXT NOT NULL,
+            paid BOOLEAN NOT NULL,
+            shipped BOOLEAN NOT NULL
+        );
+    """
+    )
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
new file mode 100644
index 00000000..0f2a1d78
--- /dev/null
+++ b/lnbits/extensions/diagonalley/models.py
@@ -0,0 +1,57 @@
+from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
+from starlette.requests import Request
+from fastapi.param_functions import Query
+from typing import Optional, Dict
+from lnbits.lnurl import encode as lnurl_encode  # type: ignore
+from lnurl.types import LnurlPayMetadata  # type: ignore
+from pydantic import BaseModel
+import json
+from sqlite3 import Row
+
+
+class Stalls(BaseModel):
+    id: str = Query(None)
+    wallet: str = Query(None)
+    name: str = Query(None)
+    publickey: str = Query(None)
+    privatekey: str = Query(None)
+    relays: str = Query(None)
+
+class createStalls(BaseModel):
+    wallet: str = Query(None)
+    name: str = Query(None)
+    publickey: str = Query(None)
+    privatekey: str = Query(None)
+    relays: str = Query(None)
+    shippingzones: str = Query(None)
+
+class Products(BaseModel):
+    id: str = Query(None)
+    stall: str = Query(None)
+    product: str = Query(None)
+    categories: str = Query(None)
+    description: str = Query(None)
+    image: str = Query(None)
+    price: int = Query(0)
+    quantity: int = Query(0)
+
+
+class Zones(BaseModel):
+    id: str = Query(None)
+    wallet: str = Query(None)
+    cost: str = Query(None)
+    countries: str = Query(None)
+
+
+class Orders(BaseModel):
+    id: str = Query(None)
+    productid: str = Query(None)
+    stall: str = Query(None)
+    product: str = Query(None)
+    quantity: int = Query(0)
+    shippingzone: int = Query(0)
+    address: str = Query(None)
+    email: str = Query(None)
+    invoiceid: str = Query(None)
+    paid: bool
+    shipped: bool
diff --git a/lnbits/extensions/diagonalley/static/js/index.js b/lnbits/extensions/diagonalley/static/js/index.js
new file mode 100644
index 00000000..1a25edaa
--- /dev/null
+++ b/lnbits/extensions/diagonalley/static/js/index.js
@@ -0,0 +1,824 @@
+/* globals Quasar, Vue, _, VueQrcode, windowMixin, LNbits, LOCALE */
+
+Vue.component(VueQrcode.name, VueQrcode)
+
+const pica = window.pica()
+
+new Vue({
+  el: '#vue',
+  mixins: [windowMixin],
+  data: function () {
+    return {
+      products: [],
+      orders: [],
+      stalls: [],
+      zones: [],
+      shippedModel: false,
+      shippingZoneOptions: [
+        'Australia',
+        'Austria',
+        'Belgium',
+        'Brazil',
+        'Canada',
+        'Denmark',
+        'Finland',
+        'France*',
+        'Germany',
+        'Greece',
+        'Hong Kong',
+        'Hungary',
+        'Ireland',
+        'Indonesia',
+        'Israel',
+        'Italy',
+        'Japan',
+        'Kazakhstan',
+        'Korea',
+        'Luxembourg',
+        'Malaysia',
+        'Mexico',
+        'Netherlands',
+        'New Zealand',
+        'Norway',
+        'Poland',
+        'Portugal',
+        'Russia',
+        'Saudi Arabia',
+        'Singapore',
+        'Spain',
+        'Sweden',
+        'Switzerland',
+        'Thailand',
+        'Turkey',
+        'Ukraine',
+        'United Kingdom**',
+        'United States***',
+        'Vietnam',
+        'China'
+      ],
+      categories: [
+        'Fashion (clothing and accessories)',
+        'Health (and beauty)',
+        'Toys (and baby equipment)',
+        'Media (Books and CDs)',
+        'Groceries (Food and Drink)',
+        'Technology (Phones and Computers)',
+        'Home (furniture and accessories)',
+        'Gifts (flowers, cards, etc)'
+      ],
+      relayOptions: [
+        'wss://nostr-relay.herokuapp.com/ws',
+        'wss://nostr-relay.bigsun.xyz/ws',
+        'wss://freedom-relay.herokuapp.com/ws'
+      ],
+      label: '',
+      ordersTable: {
+        columns: [
+          {
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },
+          {
+            name: 'address',
+            align: 'left',
+            label: 'Address',
+            field: 'address'
+          },
+          {
+            name: 'invoiceid',
+            align: 'left',
+            label: 'InvoiceID',
+            field: 'invoiceid'
+          },
+          {name: 'paid', align: 'left', label: 'Paid', field: 'paid'},
+          {name: 'shipped', align: 'left', label: 'Shipped', field: 'shipped'}
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      productsTable: {
+        columns: [
+          {
+            name: 'stall',
+            align: 'left',
+            label: 'Stall',
+            field: 'stall'
+          },
+          {
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'description',
+            align: 'left',
+            label: 'Description',
+            field: 'description'
+          },
+          {
+            name: 'categories',
+            align: 'left',
+            label: 'Categories',
+            field: 'categories'
+          },
+          {name: 'price', align: 'left', label: 'Price', field: 'price'},
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },
+          {name: 'id', align: 'left', label: 'ID', field: 'id'}
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      stallTable: {
+        columns: [
+          {
+            name: 'id',
+            align: 'left',
+            label: 'ID',
+            field: 'id'
+          },
+          {
+            name: 'name',
+            align: 'left',
+            label: 'Name',
+            field: 'name'
+          },
+          {
+            name: 'wallet',
+            align: 'left',
+            label: 'Wallet',
+            field: 'wallet'
+          },
+          {
+            name: 'publickey',
+            align: 'left',
+            label: 'Public key',
+            field: 'publickey'
+          },
+          {
+            name: 'privatekey',
+            align: 'left',
+            label: 'Private key',
+            field: 'privatekey'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      zonesTable: {
+        columns: [
+          {
+            name: 'id',
+            align: 'left',
+            label: 'ID',
+            field: 'id'
+          },
+          {
+            name: 'countries',
+            align: 'left',
+            label: 'Countries',
+            field: 'countries'
+          },
+          {
+            name: 'cost',
+            align: 'left',
+            label: 'Cost',
+            field: 'cost'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      productDialog: {
+        show: false,
+        data: {}
+      },
+      stallDialog: {
+        show: false,
+        data: {}
+      },
+      zoneDialog: {
+        show: false,
+        data: {}
+      },
+      shopDialog: {
+        show: false,
+        data: {activate: false}
+      },
+      orderDialog: {
+        show: false,
+        data: {}
+      },
+      relayDialog: {
+        show: false,
+        data: {}
+      }
+    }
+  },
+  computed: {
+    categoryOther: function () {
+      cats = trim(this.productDialog.data.categories.split(','))
+      for (let i = 0; i < cats.length; i++) {
+        if (cats[i] == 'Others') {
+          return true
+        }
+      }
+      return false
+    }
+  },
+  methods: {
+    ////////////////////////////////////////
+    ////////////////STALLS//////////////////
+    ////////////////////////////////////////
+    getStalls: function () {
+      var self = this
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/stalls?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.stalls = response.data.map(function (obj) {
+            console.log(obj)
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    openStallUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.stalls, {id: linkId})
+
+      this.stallDialog.data = _.clone(link._data)
+      this.stallDialog.show = true
+    },
+    sendStallFormData: function () {
+      if (this.stallDialog.data.id) {
+      } else {
+        var data = {
+          name: this.stallDialog.data.name,
+          wallet: this.stallDialog.data.wallet,
+          publickey: this.stallDialog.data.publickey,
+          privatekey: this.stallDialog.data.privatekey,
+          relays: this.stallDialog.data.relays
+        }
+      }
+
+      if (this.stallDialog.data.id) {
+        this.updateStall(this.stallDialog.data)
+      } else {
+        this.createStall(data)
+      }
+    },
+    updateStall: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/stalls' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.stallDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'name', 'wallet', 'publickey', 'privatekey')
+        )
+        .then(function (response) {
+          self.stalls = _.reject(self.stalls, function (obj) {
+            return obj.id == data.id
+          })
+          self.stalls.push(mapDiagonAlley(response.data))
+          self.stallDialog.show = false
+          self.stallDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createStall: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/stalls',
+          _.findWhere(self.g.user.wallets, {
+            id: self.stallDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.stalls.push(mapDiagonAlley(response.data))
+          self.stallDialog.show = false
+          self.stallDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteStall: function (stallId) {
+      var self = this
+      var stall = _.findWhere(self.stalls, {id: stallId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Stall link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/stalls/' + stallId,
+              _.findWhere(self.g.user.wallets, {id: stall.wallet}).inkey
+            )
+            .then(function (response) {
+              self.stalls = _.reject(self.stalls, function (obj) {
+                return obj.id == stallId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportStallsCSV: function () {
+      LNbits.utils.exportCSV(this.stallsTable.columns, this.stalls)
+    },
+    ////////////////////////////////////////
+    ///////////////PRODUCTS/////////////////
+    ////////////////////////////////////////
+    getProducts: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/products?all_stalls',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.products = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    openProductUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.products, {id: linkId})
+
+      self.productDialog.data = _.clone(link._data)
+      self.productDialog.show = true
+    },
+    sendProductFormData: function () {
+      if (this.productDialog.data.id) {
+      } else {
+        var data = {
+          product: this.productDialog.data.product,
+          categories:
+            this.productDialog.data.categories +
+            this.productDialog.categoriesextra,
+          description: this.productDialog.data.description,
+          image: this.productDialog.data.image,
+          price: this.productDialog.data.price,
+          quantity: this.productDialog.data.quantity
+        }
+      }
+      if (this.productDialog.data.id) {
+        this.updateProduct(this.productDialog.data)
+      } else {
+        this.createProduct(data)
+      }
+    },
+    imageAdded(file) {
+      let blobURL = URL.createObjectURL(file)
+      let image = new Image()
+      image.src = blobURL
+      image.onload = async () => {
+        let canvas = document.createElement('canvas')
+        canvas.setAttribute('width', 100)
+        canvas.setAttribute('height', 100)
+        await pica.resize(image, canvas, {
+          quality: 0,
+          alpha: true,
+          unsharpAmount: 95,
+          unsharpRadius: 0.9,
+          unsharpThreshold: 70
+        })
+        this.productDialog.data.image = canvas.toDataURL()
+        this.productDialog = {...this.productDialog}
+      }
+    },
+    imageCleared() {
+      this.productDialog.data.image = null
+      this.productDialog = {...this.productDialog}
+    },
+    updateProduct: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/products' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.productDialog.data.wallet
+          }).inkey,
+          _.pick(
+            data,
+            'shopname',
+            'relayaddress',
+            'shippingzone1',
+            'zone1cost',
+            'shippingzone2',
+            'zone2cost',
+            'email'
+          )
+        )
+        .then(function (response) {
+          self.products = _.reject(self.products, function (obj) {
+            return obj.id == data.id
+          })
+          self.products.push(mapDiagonAlley(response.data))
+          self.productDialog.show = false
+          self.productDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createProduct: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/products',
+          _.findWhere(self.g.user.wallets, {
+            id: self.productDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.products.push(mapDiagonAlley(response.data))
+          self.productDialog.show = false
+          self.productDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteProduct: function (productId) {
+      var self = this
+      var product = _.findWhere(this.products, {id: productId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this products link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/products/' + productId,
+              _.findWhere(self.g.user.wallets, {id: product.wallet}).inkey
+            )
+            .then(function (response) {
+              self.products = _.reject(self.products, function (obj) {
+                return obj.id == productId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportProductsCSV: function () {
+      LNbits.utils.exportCSV(this.productsTable.columns, this.products)
+    },
+    ////////////////////////////////////////
+    //////////////////ZONE//////////////////
+    ////////////////////////////////////////
+    getZones: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/zones?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.zones = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    openZoneUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.zones, {id: linkId})
+
+      this.zoneDialog.data = _.clone(link._data)
+      this.zoneDialog.show = true
+    },
+    sendZoneFormData: function () {
+      if (this.zoneDialog.data.id) {
+      } else {
+        var data = {
+          countries: toString(this.zoneDialog.data.countries),
+          cost: parseInt(this.zoneDialog.data.cost)
+        }
+      }
+
+      if (this.zoneDialog.data.id) {
+        this.updateZone(this.zoneDialog.data)
+      } else {
+        this.createZone(data)
+      }
+    },
+    updateZone: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/zones' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.zoneDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'countries', 'cost')
+        )
+        .then(function (response) {
+          self.zones = _.reject(self.zones, function (obj) {
+            return obj.id == data.id
+          })
+          self.zones.push(mapDiagonAlley(response.data))
+          self.zoneDialog.show = false
+          self.zoneDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createZone: function (data) {
+      var self = this
+      console.log(self.g.user.wallets[0])
+      console.log(data)
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/zones',
+          self.g.user.wallets[0].inkey,
+          data
+        )
+        .then(function (response) {
+          self.zones.push(mapDiagonAlley(response.data))
+          self.zoneDialog.show = false
+          self.zoneDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteZone: function (zoneId) {
+      var self = this
+      var zone = _.findWhere(self.zones, {id: zoneId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Zone link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/zones/' + zoneId,
+              _.findWhere(self.g.user.wallets, {id: zone.wallet}).inkey
+            )
+            .then(function (response) {
+              self.zones = _.reject(self.zones, function (obj) {
+                return obj.id == zoneId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportZonesCSV: function () {
+      LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
+    },
+    ////////////////////////////////////////
+    //////////////////SHOP//////////////////
+    ////////////////////////////////////////
+    getShops: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/shops?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.shops = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    openShopUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.shops, {id: linkId})
+
+      this.shopDialog.data = _.clone(link._data)
+      this.shopDialog.show = true
+    },
+    sendShopFormData: function () {
+      if (this.shopDialog.data.id) {
+      } else {
+        var data = {
+          countries: this.shopDialog.data.countries,
+          cost: this.shopDialog.data.cost
+        }
+      }
+
+      if (this.shopDialog.data.id) {
+        this.updateZone(this.shopDialog.data)
+      } else {
+        this.createZone(data)
+      }
+    },
+    updateShop: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/shops' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.shopDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'countries', 'cost')
+        )
+        .then(function (response) {
+          self.shops = _.reject(self.shops, function (obj) {
+            return obj.id == data.id
+          })
+          self.shops.push(mapDiagonAlley(response.data))
+          self.shopDialog.show = false
+          self.shopDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createShop: function (data) {
+      var self = this
+      console.log('cuntywoo')
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/shops',
+          _.findWhere(self.g.user.wallets, {
+            id: self.shopDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.shops.push(mapDiagonAlley(response.data))
+          self.shopDialog.show = false
+          self.shopDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteShop: function (shopId) {
+      var self = this
+      var shop = _.findWhere(self.shops, {id: shopId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Shop link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/shops/' + shopId,
+              _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
+            )
+            .then(function (response) {
+              self.shops = _.reject(self.shops, function (obj) {
+                return obj.id == shopId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportShopsCSV: function () {
+      LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
+    },
+    ////////////////////////////////////////
+    ////////////////ORDERS//////////////////
+    ////////////////////////////////////////
+    getOrders: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/orders?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.orders = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    createOrder: function () {
+      var data = {
+        address: this.orderDialog.data.address,
+        email: this.orderDialog.data.email,
+        quantity: this.orderDialog.data.quantity,
+        shippingzone: this.orderDialog.data.shippingzone
+      }
+      var self = this
+
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/orders',
+          _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
+            .inkey,
+          data
+        )
+        .then(function (response) {
+          self.orders.push(mapDiagonAlley(response.data))
+          self.orderDialog.show = false
+          self.orderDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteOrder: function (orderId) {
+      var self = this
+      var order = _.findWhere(self.orders, {id: orderId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this order link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/orders/' + orderId,
+              _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
+            )
+            .then(function (response) {
+              self.orders = _.reject(self.orders, function (obj) {
+                return obj.id == orderId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    shipOrder: function (order_id) {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/orders/shipped/' + order_id,
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.orders = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    exportOrdersCSV: function () {
+      LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
+    }
+  },
+  created: function () {
+    if (this.g.user.wallets.length) {
+      this.getStalls()
+      this.getProducts()
+      this.getZones()
+      this.getOrders()
+    }
+  }
+})
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/diagonalley/tasks.py
new file mode 100644
index 00000000..3fee63d9
--- /dev/null
+++ b/lnbits/extensions/diagonalley/tasks.py
@@ -0,0 +1,29 @@
+import asyncio
+
+from lnbits.core.models import Payment
+from lnbits.tasks import register_invoice_listener
+
+from .crud import get_ticket, set_ticket_paid
+
+
+async def wait_for_paid_invoices():
+    invoice_queue = asyncio.Queue()
+    register_invoice_listener(invoice_queue)
+
+    while True:
+        payment = await invoice_queue.get()
+        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)
\ No newline at end of file
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html b/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
new file mode 100644
index 00000000..530c89e8
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
@@ -0,0 +1,129 @@
+<q-expansion-item
+  group="extras"
+  icon="swap_vertical_circle"
+  label="Setup guide"
+  :content-inset-level="0.5"
+>
+  <q-card>
+    <q-card-section>
+      <h5 class="text-subtitle1 q-my-none">
+        Diagon Alley: Decentralised Market-Stalls
+      </h5>
+      <p>
+        Each Stall has its own keys!<br />
+        <ol>
+          <li>Create Shipping Zones you're willing to ship to</li>
+          <li>Create a Stall to list yiur products on</li>
+          <li>Create products to put on the Stall</li>
+          <li>List stalls on a simple frontend shop page, or point at Nostr shop client key</li>
+        </ol> 
+        Make a list of products to sell, point your list of products at a public
+        relay. Buyers browse your products on the relay, and pay you directly.
+        Ratings are managed by the relay. Your stall can be listed in multiple
+        relays, even over TOR, if you wish to be anonymous.<br />
+        More information on the
+        <a href="https://github.com/lnbits/Diagon-Alley"
+          >Diagon Alley Protocol</a
+        ><br />
+        <small>
+          Created by, <a href="https://github.com/benarc">Ben Arc</a></small
+        >
+      </p>
+    </q-card-section>
+  </q-card>
+</q-expansion-item>
+
+<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="Get prodcuts, categorised by wallet"
+  >
+    <q-card>
+      <q-card-section>
+        <code
+          ><span class="text-light-blue">GET</span>
+          /diagonalley/api/v1/stall/products/&lt;relay_id&gt;</code
+        >
+        <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 201 CREATED (application/json)
+        </h5>
+        <code>Product JSON list</code>
+        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+        <code
+          >curl -X GET {{ request.url_root
+          }}api/v1/stall/products/&lt;relay_id&gt;</code
+        >
+      </q-card-section>
+    </q-card>
+  </q-expansion-item>
+  <q-expansion-item
+    group="api"
+    dense
+    expand-separator
+    label="Get invoice for product"
+  >
+    <q-card>
+      <q-card-section>
+        <code
+          ><span class="text-light-green">POST</span>
+          /diagonalley/api/v1/stall/order/&lt;relay_id&gt;</code
+        >
+        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
+        <code
+          >{"id": &lt;string&gt;, "address": &lt;string&gt;, "shippingzone":
+          &lt;integer&gt;, "email": &lt;string&gt;, "quantity":
+          &lt;integer&gt;}</code
+        >
+        <h5 class="text-caption q-mt-sm q-mb-none">
+          Returns 201 CREATED (application/json)
+        </h5>
+        <code
+          >{"checking_id": &lt;string&gt;,"payment_request":
+          &lt;string&gt;}</code
+        >
+        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+        <code
+          >curl -X POST {{ request.url_root
+          }}api/v1/stall/order/&lt;relay_id&gt; -d '{"id": &lt;product_id&&gt;,
+          "email": &lt;customer_email&gt;, "address": &lt;customer_address&gt;,
+          "quantity": 2, "shippingzone": 1}' -H "Content-type: application/json"
+        </code>
+      </q-card-section>
+    </q-card>
+  </q-expansion-item>
+  <q-expansion-item
+    group="api"
+    dense
+    expand-separator
+    label="Check a product has been shipped"
+    class="q-mb-md"
+  >
+    <q-card>
+      <q-card-section>
+        <code
+          ><span class="text-light-blue">GET</span>
+          /diagonalley/api/v1/stall/checkshipped/&lt;checking_id&gt;</code
+        >
+        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+        <h5 class="text-caption q-mt-sm q-mb-none">
+          Returns 200 OK (application/json)
+        </h5>
+        <code>{"shipped": &lt;boolean&gt;}</code>
+        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+        <code
+          >curl -X GET {{ request.url_root
+          }}api/v1/stall/checkshipped/&lt;checking_id&gt; -H "Content-type:
+          application/json"</code
+        >
+      </q-card-section>
+    </q-card>
+  </q-expansion-item>
+</q-expansion-item>
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
new file mode 100644
index 00000000..98405f6d
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -0,0 +1,634 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+<div class="row q-col-gutter-md">
+  <q-dialog v-model="productDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="sendProductFormData" class="q-gutter-md">
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="productDialog.data.stall"
+          :options="stalls"
+          label="Stall"
+        >
+        </q-select>
+        <q-input
+          filled
+          dense
+          v-model.trim="productDialog.data.product"
+          label="Product"
+        ></q-input>
+
+        <q-input
+          filled
+          dense
+          v-model.trim="productDialog.data.description"
+          label="Description"
+        ></q-input>
+        <div class="row">
+          <div class="col-5">
+            <q-select
+              filled
+              dense
+              v-model.trim="productDialog.data.categories"
+              multiple
+              :options="categories"
+              label="Categories"
+              class="q-pr-sm"
+            ></q-select>
+          </div>
+          <div class="col-7">
+            <q-input
+              filled
+              dense
+              v-model.trim="productDialog.categoriesextra"
+              placeholder="crafts,robots,etc (seperate by comma)"
+              label="Other categories *optional"
+            ></q-input>
+          </div>
+        </div>
+
+        <q-file
+          class="q-pr-md"
+          filled
+          dense
+          capture="environment"
+          accept="image/jpeg, image/png"
+          :max-file-size="3*1024**2"
+          label="Small image (optional)"
+          clearable
+          @input="imageAdded"
+          @clear="imageCleared"
+        >
+          <template v-if="productDialog.data.image" v-slot:before>
+            <img style="height: 1em" :src="productDialog.data.image" />
+          </template>
+          <template v-if="productDialog.data.image" v-slot:append>
+            <q-icon
+              name="cancel"
+              @click.stop.prevent="imageCleared"
+              class="cursor-pointer"
+            />
+          </template>
+        </q-file>
+        <q-input
+          filled
+          dense
+          v-model.number="productDialog.data.price"
+          type="number"
+          label="Price"
+        ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.number="productDialog.data.quantity"
+          type="number"
+          label="Quantity"
+        ></q-input>
+
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="productDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Product</q-btn
+          >
+
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="productDialog.data.image == null
+              || productDialog.data.product == null
+              || productDialog.data.description == null
+              || productDialog.data.quantity == null"
+            type="submit"
+            >Create Product</q-btn
+          >
+
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="zoneDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="sendZoneFormData" class="q-gutter-md">
+        <q-select
+          filled
+          dense
+          multiple
+          :options="shippingZoneOptions"
+          label="Countries"
+          v-model.trim="zoneDialog.data.countries"
+        ></q-select>
+        <q-input
+          filled
+          dense
+          type="number"
+          v-model.trim="zoneDialog.data.cost"
+          label="Cost (sats)"
+        ></q-input>
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="zoneDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Shipping Zone</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="zoneDialog.data.countries == null
+              || zoneDialog.data.cost == null"
+            type="submit"
+            >Create Shipping Zone</q-btn
+          >
+
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+
+  <q-dialog v-model="shopDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="sendShopFormData" class="q-gutter-md">
+        <q-toggle
+        label="Activate shop"
+        color="primary"
+        v-model="shopDialog.data.activate"
+      ></q-toggle>
+        <q-select
+          filled
+          dense
+          multiple
+          :options="stalls"
+          label="Stalls"
+          v-model.trim="shopDialog.data.stalls"
+        ></q-select>
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="shopDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Relay</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="shopDialog.data.activate == null
+              || shopDialog.data.stalls == null"
+            type="submit"
+            >Launch</q-btn
+          >
+
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="stallDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="sendStallFormData" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="stallDialog.data.name"
+          label="Name"
+        ></q-input>
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="stallDialog.data.wallet"
+          :options="g.user.walletOptions"
+          label="Wallet *"
+        >
+        </q-select>
+        <div class="row">
+          <div class="col-5">
+            <q-btn unelevated color="primary">Generate keys</q-btn>
+          </div>
+          <div class="col-5">
+            <q-btn unelevated color="primary">Restore keys</q-btn>
+          </div>
+        </div>
+        <q-input
+          v-if="stallDialog.restorekeys"
+          filled
+          dense
+          v-model.trim="stallDialog.data.publickey"
+          label="Public Key"
+        ></q-input>
+        <q-input
+          v-if="stallDialog.restorekeys"
+          filled
+          dense
+          v-model.trim="stallDialog.data.privatekey"
+          label="Private Key"
+        ></q-input>
+        <q-select
+          :options="shippingZoneOptions"
+          filled
+          dense
+          multiple
+          v-model.trim="stallDialog.data.shippingzones"
+          label="Shipping Zones"
+        ></q-select>
+        <q-select
+          :options="relayOptions"
+          filled
+          dense
+          multiple
+          v-model.trim="stallDialog.data.relays"
+          label="Relays"
+        ></q-select>
+        <q-input
+          filled
+          dense
+          v-model.trim="stallDialog.data.name"
+          label="Custom relays (seperate by comma)"
+        ></q-input>
+        
+        <q-input
+          filled
+          dense
+          v-model.trim="stallDialog.data.nostrShops"
+          label="Stall public keys (seperate by comma)"
+        ></q-input>
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="stallDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Stall</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="stallDialog.data.countries == null
+              || stallDialog.data.cost == null"
+            type="submit"
+            >Create Stall</q-btn
+          >
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <q-btn unelevated color="primary" @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
+        >
+        <q-btn unelevated color="primary" @click="zoneDialog.show = true"
+          >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
+        >
+        <q-btn unelevated color="primary" @click="stallDialog.show = true"
+          >+ Stall
+          <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
+        >
+        <q-btn unelevated color="primary" @click="shopDialog.show = true"
+          >Launch frontend shop (not Nostr)
+          <q-tooltip> Makes a simple frontend shop for your stalls</q-tooltip></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">Orders</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportOrdersCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="orders"
+          row-key="id"
+          :columns="ordersTable.columns"
+          :pagination.sync="ordersTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </q-th>
+              <q-th auto-width></q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="shipOrder(props.row.id)"
+                  icon="add_shopping_cart"
+                  color="green"
+                >
+                  <q-tooltip> Product shipped? </q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteOrder(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </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">Products</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportProductsCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="products"
+          row-key="id"
+          :columns="productsTable.columns"
+          :pagination.sync="productsTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width></q-th>
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </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="add_shopping_cart"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  type="a"
+                  :href="props.row.wallet"
+                  target="_blank"
+                ></q-btn>
+                <q-tooltip> Link to pass to stall relay </q-tooltip>
+              </q-td>
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+              <q-td class="text-center" auto-width>
+                <img
+                  v-if="props.row.image"
+                  :src="props.row.image"
+                  style="height: 1.5em"
+                />
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openProductUpdateDialog(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteProduct(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </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">Stalls</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportStallsCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="stalls"
+          row-key="id"
+          :columns="stallTable.columns"
+          :pagination.sync="stallTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </q-th>
+              <q-th auto-width></q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openStallUpdateDialog(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteStall(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </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">Shipping Zones</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportZonesCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="zones"
+          row-key="id"
+          :columns="zonesTable.columns"
+          :pagination.sync="zonesTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </q-th>
+              <q-th auto-width></q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openZoneUpdateDialog(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteZone(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  <div class="col-12 col-md-4 col-lg-5 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <h6 class="text-subtitle1 q-my-none">
+          LNbits Diagon Alley Extension, powered by Nostr
+        </h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none">
+        <q-separator></q-separator>
+        <q-list> {% include "diagonalley/_api_docs.html" %} </q-list>
+      </q-card-section>
+    </q-card>
+    <q-card>
+      <q-card-section>
+        <h6 class="text-subtitle1 q-my-none">Messages (example)</h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none" >
+        <q-separator></q-separator>
+
+        <div class="row q-pa-md">
+          <div class="col-4">
+            <q-btn outline color="primary" size="md" style="height: 90px; width:90%"
+              >OrderID:87h87h<br/>KJBIBYBUYBUF90898....</q-btn
+            >
+            <q-btn outline color="primary" size="md" style="height: 90px; width:90%"
+              >OrderID:NIUHB7<br/>79867KJGJHGVFYFV....</q-btn
+            >
+          </div>
+          <div class="col-8">
+            <div style="height: 350px">
+            <q-chat-message
+              :text="['I have not received my Welsh Cakes']"
+              sent
+            ></q-chat-message>
+            <q-chat-message
+              :text="['Yep, its Brexit. They are stuck in customs. We will have to wait it out. I can offer a full refund?']"
+            ></q-chat-message>
+          </div>
+            <q-input ><template v-slot:after>
+              <q-btn round dense flat icon="send" />
+            </template></q-input>
+            
+        </div>
+      </q-card-section>
+    </q-card>
+  </div>
+  </div>
+</div>
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
+<script src="/diagonalley/static/js/index.js"></script>
+{% endblock %}
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
new file mode 100644
index 00000000..768bedfe
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -0,0 +1,9 @@
+<pre id="json"></pre>
+
+<script>
+  document.getElementById('json').innerHTML = JSON.stringify(
+    '{{ stall }}',
+    null,
+    2
+  )
+</script>
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
new file mode 100644
index 00000000..2deed72b
--- /dev/null
+++ b/lnbits/extensions/diagonalley/views.py
@@ -0,0 +1,44 @@
+
+from typing import List
+
+from fastapi import Request, WebSocket, WebSocketDisconnect
+from fastapi.params import Depends
+from fastapi.templating import Jinja2Templates
+from starlette.responses import HTMLResponse  # type: ignore
+
+from http import HTTPStatus
+import json
+from lnbits.decorators import check_user_exists, validate_uuids
+from lnbits.extensions.diagonalley import diagonalley_ext
+
+from .crud import (
+    create_diagonalley_product,
+    get_diagonalley_product,
+    get_diagonalley_products,
+    delete_diagonalley_product,
+    create_diagonalley_order,
+    get_diagonalley_order,
+    get_diagonalley_orders,
+    update_diagonalley_product,
+)
+
+
+@diagonalley_ext.get("/", response_class=HTMLResponse)
+@validate_uuids(["usr"], required=True)
+@check_user_exists(request: Request)
+async def index():
+    return await render_template("diagonalley/index.html", user=g.user)
+
+
+@diagonalley_ext.get("/<stall_id>", response_class=HTMLResponse)
+async def display(request: Request, stall_id):
+    product = await get_diagonalley_products(stall_id)
+    if not product:
+        abort(HTTPStatus.NOT_FOUND, "Stall does not exist.")
+
+    return await render_template(
+        "diagonalley/stall.html",
+        stall=json.dumps(
+            [product._asdict() for product in await get_diagonalley_products(stall_id)]
+        ),
+    )
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
new file mode 100644
index 00000000..4de2799e
--- /dev/null
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -0,0 +1,348 @@
+from http import HTTPStatus
+
+from fastapi import Request
+from fastapi.param_functions import Query
+from fastapi.params import Depends
+from starlette.exceptions import HTTPException
+
+from lnbits.core.crud import get_user
+from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+
+from . import diagonalley_ext
+from .crud import (
+    create_diagonalley_product,
+    get_diagonalley_product,
+    get_diagonalley_products,
+    delete_diagonalley_product,
+    create_diagonalley_zone,
+    update_diagonalley_zone,
+    get_diagonalley_zone,
+    get_diagonalley_zones,
+    delete_diagonalley_zone,
+    create_diagonalley_stall,
+    update_diagonalley_stall,
+    get_diagonalley_stall,
+    get_diagonalley_stalls,
+    delete_diagonalley_stall,
+    create_diagonalley_order,
+    get_diagonalley_order,
+    get_diagonalley_orders,
+    update_diagonalley_product,
+    delete_diagonalley_order,
+)
+from lnbits.core.services import create_invoice
+from base64 import urlsafe_b64encode
+from uuid import uuid4
+
+# from lnbits.db import open_ext_db
+
+from . import db
+from .models import Products, Orders, Stalls
+
+### Products
+
+@copilot_ext.get("/api/v1/copilot/{copilot_id}")
+async def api_copilot_retrieve(
+    req: Request,
+    copilot_id: str = Query(None),
+    wallet: WalletTypeInfo = Depends(get_key_type),
+):
+    copilot = await get_copilot(copilot_id)
+    if not copilot:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Copilot not found"
+        )
+    if not copilot.lnurl_toggle:
+        return copilot.dict()
+    return {**copilot.dict(), **{"lnurl": copilot.lnurl(req)}}
+
+
+@diagonalley_ext.get("/api/v1/products")
+async def api_diagonalley_products(
+    req: Request,
+    wallet: WalletTypeInfo = Depends(get_key_type),
+):
+    wallet_ids = [wallet.wallet.id]
+
+    if "all_stalls" in request.args:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+
+    return ([product._asdict() for product in await get_diagonalley_products(wallet_ids)])
+
+
+@diagonalley_ext.post("/api/v1/products")
+@diagonalley_ext.put("/api/v1/products/{product_id}")
+async def api_diagonalley_product_create(
+    data: Products, 
+    product_id=: str = Query(None), 
+    wallet: WalletTypeInfo = Depends(get_key_type)
+    ):
+
+    if product_id:
+        product = await get_diagonalley_product(product_id)
+
+        if not product:
+            return ({"message": "Withdraw product does not exist."}))
+
+        if product.wallet != wallet.wallet.id:
+            return ({"message": "Not your withdraw product."}))
+
+        product = await update_diagonalley_product(product_id, data)
+    else:
+        product = await create_diagonalley_product(wallet_id=wallet.wallet.id, data)
+
+    return ({**product._asdict()}))
+
+
+@diagonalley_ext.route("/api/v1/products/{product_id}")
+async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
+    product = await get_diagonalley_product(product_id)
+
+    if not product:
+        return ({"message": "Product does not exist."})
+
+    if product.wallet != wallet.wallet.id:
+        return ({"message": "Not your Diagon Alley."})
+
+    await delete_diagonalley_product(product_id)
+
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+# # # Shippingzones
+
+
+@diagonalley_ext.get("/api/v1/zones")
+async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
+    wallet_ids = [wallet.wallet.id]
+
+    if "all_wallets" in request.args:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+
+    return ([zone._asdict() for zone in await get_diagonalley_zones(wallet_ids)]))
+
+
+@diagonalley_ext.post("/api/v1/zones")
+@diagonalley_ext.put("/api/v1/zones/{zone_id}")
+async def api_diagonalley_zone_create(
+    data: Zones, 
+    zone_id: str = Query(None),  
+    wallet: WalletTypeInfo = Depends(get_key_type)
+    ):
+    if zone_id:
+        zone = await get_diagonalley_zone(zone_id)
+
+        if not zone:
+            return ({"message": "Zone does not exist."}))
+
+        if zone.wallet != walley.wallet.id:
+            return ({"message": "Not your record."}))
+
+        zone = await update_diagonalley_zone(zone_id, data)
+    else:
+        zone = await create_diagonalley_zone(wallet=wallet.wallet.id, data)
+
+    return ({**zone._asdict()}))
+
+
+@diagonalley_ext.delete("/api/v1/zones/{zone_id}")
+async def api_diagonalley_zone_delete(zone_id: str = Query(None),  wallet: WalletTypeInfo = Depends(require_admin_key)):
+    zone = await get_diagonalley_zone(zone_id)
+
+    if not zone:
+        return ({"message": "zone does not exist."})
+
+    if zone.wallet != wallet.wallet.id:
+        return ({"message": "Not your zone."})
+
+    await delete_diagonalley_zone(zone_id)
+
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+# # # Stalls
+
+
+@diagonalley_ext.get("/api/v1/stalls")
+async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type)):
+    wallet_ids = [wallet.wallet.id]
+
+    if "all_wallets" in request.args:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+
+    return ([stall._asdict() for stall in await get_diagonalley_stalls(wallet_ids)])
+
+
+@diagonalley_ext.post("/api/v1/stalls")
+@diagonalley_ext.put("/api/v1/stalls/{stall_id}")
+async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+
+    if stall_id:
+        stall = await get_diagonalley_stall(stall_id)
+
+        if not stall:
+            return ({"message": "Withdraw stall does not exist."}))
+
+        if stall.wallet != wallet.wallet.id:
+            return ({"message": "Not your withdraw stall."}))
+
+        stall = await update_diagonalley_stall(stall_id, data)
+    else:
+        stall = await create_diagonalley_stall(wallet_id=wallet.wallet.id, data)
+
+    return ({**stall._asdict()}))
+
+
+@diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
+async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)):
+    stall = await get_diagonalley_stall(stall_id)
+
+    if not stall:
+        return ({"message": "Stall does not exist."})
+
+    if stall.wallet != wallet.wallet.id:
+        return ({"message": "Not your Stall."})
+
+    await delete_diagonalley_stall(stall_id)
+
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+###Orders
+
+
+@diagonalley_ext.get("/api/v1/orders")
+async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type)):
+    wallet_ids = [wallet.wallet.id]
+
+    if "all_wallets" in request.args:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+
+    try:
+        return ([order._asdict() for order in await get_diagonalley_orders(wallet_ids)])
+    except:
+        return ({"message": "We could not retrieve the orders."}))
+
+
+@diagonalley_ext.post("/api/v1/orders")
+
+async def api_diagonalley_order_create(data: createOrders, wallet: WalletTypeInfo = Depends(get_key_type)):
+    order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data)
+    return ({**order._asdict()})
+
+
+@diagonalley_ext.delete("/api/v1/orders/{order_id}")
+async def api_diagonalley_order_delete(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+    order = await get_diagonalley_order(order_id)
+
+    if not order:
+        return ({"message": "Order does not exist."})
+
+    if order.wallet != wallet.wallet.id:
+        return ({"message": "Not your Order."})
+
+    await delete_diagonalley_order(order_id)
+
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+@diagonalley_ext.get("/api/v1/orders/paid/{order_id}")
+async def api_diagonalley_order_paid(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)):
+    await db.execute(
+        "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
+        (
+            True,
+            order_id,
+        ),
+    )
+    return "", HTTPStatus.OK
+
+
+@diagonalley_ext.get("/api/v1/orders/shipped/{order_id}")
+async def api_diagonalley_order_shipped(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+    await db.execute(
+        "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
+        (
+            True,
+            order_id,
+        ),
+    )
+    order = await db.fetchone(
+        "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
+    )
+
+    return ([order._asdict() for order in get_diagonalley_orders(order["wallet"])]))
+
+
+###List products based on stall id
+
+
+@diagonalley_ext.get("/api/v1/stall/products/{stall_id}")
+async def api_diagonalley_stall_products(stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+
+    rows = await db.fetchone(
+        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+    )
+    print(rows[1])
+    if not rows:
+        return ({"message": "Stall does not exist."})
+
+    products = db.fetchone(
+        "SELECT * FROM diagonalley.products WHERE wallet = ?", (rows[1],)
+    )
+    if not products:
+        return ({"message": "No products"})
+
+    return ([products._asdict() for products in await get_diagonalley_products(rows[1])])
+
+
+###Check a product has been shipped
+
+
+@diagonalley_ext.get("/api/v1/stall/checkshipped/{checking_id}")
+async def api_diagonalley_stall_checkshipped(checking_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+    rows = await db.fetchone(
+        "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
+    )
+    return ({"shipped": rows["shipped"]})
+
+
+###Place order
+
+
+@diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
+async def api_diagonalley_stall_order(data:createOrders, wallet: WalletTypeInfo = Depends(get_key_type)):
+    product = await get_diagonalley_product(data.id)
+    shipping = await get_diagonalley_stall(stall_id)
+
+    if data.shippingzone == 1:
+        shippingcost = shipping.zone1cost
+    else:
+        shippingcost = shipping.zone2cost
+
+    checking_id, payment_request = await create_invoice(
+        wallet_id=product.wallet,
+        amount=shippingcost + (data.quantity * product.price),
+        memo=data.id,
+    )
+    selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
+    await db.execute(
+        """
+            INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            """,
+        (
+            selling_id,
+            data.id,
+            product.wallet,
+            product.product,
+            data.quantity,
+            data.shippingzone,
+            data.address,
+            data.email,
+            checking_id,
+            False,
+            False,
+        ),
+    )
+    return ({"checking_id": checking_id, "payment_request": payment_request}))

From 903e0d5b0b2f2f4ead59a3a769585c91bf8354c2 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 27 Jan 2022 14:58:58 +0000
Subject: [PATCH 002/174] products

---
 lnbits/extensions/diagonalley/views_api.py | 75 ++++++++++++----------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 4de2799e..9df2c1d8 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -1,4 +1,6 @@
+from base64 import urlsafe_b64encode
 from http import HTTPStatus
+from uuid import uuid4
 
 from fastapi import Request
 from fastapi.param_functions import Query
@@ -6,41 +8,44 @@ from fastapi.params import Depends
 from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+from lnbits.core.services import create_invoice
+from lnbits.decorators import (
+    WalletTypeInfo,
+    api_check_wallet_key,
+    api_validate_post_request,
+    get_key_type,
+    require_admin_key,
+)
 
-from . import diagonalley_ext
+from . import db, diagonalley_ext
 from .crud import (
-    create_diagonalley_product,
-    get_diagonalley_product,
-    get_diagonalley_products,
-    delete_diagonalley_product,
-    create_diagonalley_zone,
-    update_diagonalley_zone,
-    get_diagonalley_zone,
-    get_diagonalley_zones,
-    delete_diagonalley_zone,
-    create_diagonalley_stall,
-    update_diagonalley_stall,
-    get_diagonalley_stall,
-    get_diagonalley_stalls,
-    delete_diagonalley_stall,
     create_diagonalley_order,
+    create_diagonalley_product,
+    create_diagonalley_stall,
+    create_diagonalley_zone,
+    delete_diagonalley_order,
+    delete_diagonalley_product,
+    delete_diagonalley_stall,
+    delete_diagonalley_zone,
     get_diagonalley_order,
     get_diagonalley_orders,
+    get_diagonalley_product,
+    get_diagonalley_products,
+    get_diagonalley_stall,
+    get_diagonalley_stalls,
+    get_diagonalley_zone,
+    get_diagonalley_zones,
     update_diagonalley_product,
-    delete_diagonalley_order,
+    update_diagonalley_stall,
+    update_diagonalley_zone,
 )
-from lnbits.core.services import create_invoice
-from base64 import urlsafe_b64encode
-from uuid import uuid4
+from .models import Orders, Products, Stalls
 
 # from lnbits.db import open_ext_db
 
-from . import db
-from .models import Products, Orders, Stalls
 
 ### Products
-
+"""
 @copilot_ext.get("/api/v1/copilot/{copilot_id}")
 async def api_copilot_retrieve(
     req: Request,
@@ -55,26 +60,27 @@ async def api_copilot_retrieve(
     if not copilot.lnurl_toggle:
         return copilot.dict()
     return {**copilot.dict(), **{"lnurl": copilot.lnurl(req)}}
-
+"""
 
 @diagonalley_ext.get("/api/v1/products")
 async def api_diagonalley_products(
     req: Request,
     wallet: WalletTypeInfo = Depends(get_key_type),
+    all_stalls: bool = Query(False)
 ):
     wallet_ids = [wallet.wallet.id]
 
-    if "all_stalls" in request.args:
+    if all_stalls:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([product._asdict() for product in await get_diagonalley_products(wallet_ids)])
+    return ([product.dict() for product in await get_diagonalley_products(wallet_ids)])
 
 
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
     data: Products, 
-    product_id=: str = Query(None), 
+    product_id: str = Query(None), 
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
 
@@ -82,19 +88,19 @@ async def api_diagonalley_product_create(
         product = await get_diagonalley_product(product_id)
 
         if not product:
-            return ({"message": "Withdraw product does not exist."}))
+            return ({"message": "Withdraw product does not exist."})
 
         if product.wallet != wallet.wallet.id:
-            return ({"message": "Not your withdraw product."}))
+            return ({"message": "Not your withdraw product."})
 
         product = await update_diagonalley_product(product_id, data)
     else:
         product = await create_diagonalley_product(wallet_id=wallet.wallet.id, data)
 
-    return ({**product._asdict()}))
+    return product.dict()
 
 
-@diagonalley_ext.route("/api/v1/products/{product_id}")
+@diagonalley_ext.delete("/api/v1/products/{product_id}")
 async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
     product = await get_diagonalley_product(product_id)
 
@@ -105,7 +111,6 @@ async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = D
         return ({"message": "Not your Diagon Alley."})
 
     await delete_diagonalley_product(product_id)
-
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
@@ -113,13 +118,13 @@ async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = D
 
 
 @diagonalley_ext.get("/api/v1/zones")
-async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
     wallet_ids = [wallet.wallet.id]
 
-    if "all_wallets" in request.args:
+    if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([zone._asdict() for zone in await get_diagonalley_zones(wallet_ids)]))
+    return ([zone.dict() for zone in await get_diagonalley_zones(wallet_ids)])
 
 
 @diagonalley_ext.post("/api/v1/zones")

From 8db457bd423b000d123e91f0c031b02bea0e8d69 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 27 Jan 2022 15:26:55 +0000
Subject: [PATCH 003/174] zones

---
 lnbits/extensions/diagonalley/crud.py      | 63 +++++++++-------------
 lnbits/extensions/diagonalley/models.py    | 41 +++++++++-----
 lnbits/extensions/diagonalley/views_api.py | 26 +++++----
 3 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index c6ce8222..7dc02cd4 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -1,17 +1,17 @@
+import re
 from base64 import urlsafe_b64encode
-from uuid import uuid4
 from typing import List, Optional, Union
+from uuid import uuid4
 
-from lnbits.settings import WALLET
+import httpx
 
 # from lnbits.db import open_ext_db
 from lnbits.db import SQLITE
-from . import db
-from .models import Products, Orders, Stalls, Zones
-
-import httpx
 from lnbits.helpers import urlsafe_short_hash
-import re
+from lnbits.settings import WALLET
+
+from . import db
+from .models import Orders, Products, Stalls, Zones, createProduct, createZones
 
 regex = re.compile(
     r"^(?:http|ftp)s?://"  # http:// or https://
@@ -28,35 +28,27 @@ regex = re.compile(
 
 
 async def create_diagonalley_product(
-    *,
-    stall_id: str,
-    product: str,
-    categories: str,
-    description: str,
-    image: Optional[str] = None,
-    price: int,
-    quantity: int,
-    shippingzones: str,
+    data: createProduct
 ) -> Products:
-    returning = "" if db.type == SQLITE else "RETURNING ID"
-    method = db.execute if db.type == SQLITE else db.fetchone
+    # returning = "" if db.type == SQLITE else "RETURNING ID"
+    # method = db.execute if db.type == SQLITE else db.fetchone
     product_id = urlsafe_short_hash()
     # with open_ext_db("diagonalley") as db:
-    result = await (method)(
+    # result = await (method)(
+    await db.execute(
         f"""
-        INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity, shippingzones)
+        INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-        {returning}
         """,
         (
             product_id,
-            stall_id,
-            product,
-            categories,
-            description,
-            image,
-            price,
-            quantity,
+            data.stall,
+            data.product,
+            data.categories,
+            data.description,
+            data.image,
+            data.price,
+            data.quantity,
         ),
     )
     product = await get_diagonalley_product(product_id)
@@ -109,17 +101,11 @@ async def delete_diagonalley_product(product_id: str) -> None:
 
 
 async def create_diagonalley_zone(
-    *,
-    wallet: Optional[str] = None,
-    cost: Optional[int] = 0,
-    countries: Optional[str] = None,
+    wallet,
+    data: createZones
 ) -> Zones:
-
-    returning = "" if db.type == SQLITE else "RETURNING ID"
-    method = db.execute if db.type == SQLITE else db.fetchone
-
     zone_id = urlsafe_short_hash()
-    result = await (method)(
+    await db.execute(
         f"""
         INSERT INTO diagonalley.zones (
             id,
@@ -129,9 +115,8 @@ async def create_diagonalley_zone(
 
         )
         VALUES (?, ?, ?, ?)
-        {returning}
         """,
-        (zone_id, wallet, cost, countries),
+        (zone_id, wallet, data.cost, data.countries),
     )
 
     zone = await get_diagonalley_zone(zone_id)
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 0f2a1d78..bd667a2f 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -1,12 +1,15 @@
-from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
-from starlette.requests import Request
+import json
+from lib2to3.pytree import Base
+from sqlite3 import Row
+from typing import Dict, Optional
+from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+
 from fastapi.param_functions import Query
-from typing import Optional, Dict
-from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
-import json
-from sqlite3 import Row
+from starlette.requests import Request
+
+from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class Stalls(BaseModel):
@@ -25,23 +28,35 @@ class createStalls(BaseModel):
     relays: str = Query(None)
     shippingzones: str = Query(None)
 
-class Products(BaseModel):
-    id: str = Query(None)
+class createProduct(BaseModel):
     stall: str = Query(None)
     product: str = Query(None)
     categories: str = Query(None)
     description: str = Query(None)
     image: str = Query(None)
-    price: int = Query(0)
-    quantity: int = Query(0)
+    price: int = Query(0, ge=0)
+    quantity: int = Query(0, ge=0)
 
+class Products(BaseModel):
+    id: str
+    stall: str
+    product: str
+    categories: str
+    description: str
+    image: str
+    price: int
+    quantity: int
 
-class Zones(BaseModel):
-    id: str = Query(None)
-    wallet: str = Query(None)
+class createZones(BaseModel):
     cost: str = Query(None)
     countries: str = Query(None)
 
+class Zones(BaseModel):
+    id: str
+    wallet: str
+    cost: str
+    countries: str
+
 
 class Orders(BaseModel):
     id: str = Query(None)
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 9df2c1d8..1ad83936 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -39,7 +39,7 @@ from .crud import (
     update_diagonalley_stall,
     update_diagonalley_zone,
 )
-from .models import Orders, Products, Stalls
+from .models import Orders, Products, Stalls, Zones, createProduct, createZones
 
 # from lnbits.db import open_ext_db
 
@@ -79,7 +79,7 @@ async def api_diagonalley_products(
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
-    data: Products, 
+    data: createProduct, 
     product_id: str = Query(None), 
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
@@ -93,9 +93,9 @@ async def api_diagonalley_product_create(
         if product.wallet != wallet.wallet.id:
             return ({"message": "Not your withdraw product."})
 
-        product = await update_diagonalley_product(product_id, data)
+        product = await update_diagonalley_product(product_id, **data.dict())
     else:
-        product = await create_diagonalley_product(wallet_id=wallet.wallet.id, data)
+        product = await create_diagonalley_product(data=data)
 
     return product.dict()
 
@@ -126,11 +126,10 @@ async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type),
 
     return ([zone.dict() for zone in await get_diagonalley_zones(wallet_ids)])
 
-
 @diagonalley_ext.post("/api/v1/zones")
 @diagonalley_ext.put("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_create(
-    data: Zones, 
+    data: createZones, 
     zone_id: str = Query(None),  
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
@@ -138,20 +137,20 @@ async def api_diagonalley_zone_create(
         zone = await get_diagonalley_zone(zone_id)
 
         if not zone:
-            return ({"message": "Zone does not exist."}))
+            return ({"message": "Zone does not exist."})
 
-        if zone.wallet != walley.wallet.id:
-            return ({"message": "Not your record."}))
+        if zone.wallet != wallet.wallet.id:
+            return ({"message": "Not your record."})
 
-        zone = await update_diagonalley_zone(zone_id, data)
+        zone = await update_diagonalley_zone(zone_id, **data.dict())
     else:
-        zone = await create_diagonalley_zone(wallet=wallet.wallet.id, data)
+        zone = await create_diagonalley_zone(wallet=wallet.wallet.id, data=data)
 
-    return ({**zone._asdict()}))
+    return zone.dict()
 
 
 @diagonalley_ext.delete("/api/v1/zones/{zone_id}")
-async def api_diagonalley_zone_delete(zone_id: str = Query(None),  wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
     zone = await get_diagonalley_zone(zone_id)
 
     if not zone:
@@ -161,7 +160,6 @@ async def api_diagonalley_zone_delete(zone_id: str = Query(None),  wallet: Walle
         return ({"message": "Not your zone."})
 
     await delete_diagonalley_zone(zone_id)
-
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 

From d6d33c6a22c1e5ed9c336ec1337018407eb1562e Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 27 Jan 2022 16:18:12 +0000
Subject: [PATCH 004/174] stalls

---
 lnbits/extensions/diagonalley/crud.py      | 34 ++++++++++++----------
 lnbits/extensions/diagonalley/models.py    | 25 ++++++++--------
 lnbits/extensions/diagonalley/views_api.py | 29 +++++++++++-------
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 7dc02cd4..3b58b129 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -11,7 +11,15 @@ from lnbits.helpers import urlsafe_short_hash
 from lnbits.settings import WALLET
 
 from . import db
-from .models import Orders, Products, Stalls, Zones, createProduct, createZones
+from .models import (
+    Orders,
+    Products,
+    Stalls,
+    Zones,
+    createProduct,
+    createStalls,
+    createZones,
+)
 
 regex = re.compile(
     r"^(?:http|ftp)s?://"  # http:// or https://
@@ -185,20 +193,10 @@ async def delete_diagonalley_zone(zone_id: str) -> None:
 
 
 async def create_diagonalley_stall(
-    *,
-    wallet: str,
-    name: str,
-    publickey: str,
-    privatekey: str,
-    relays: str,
-    shippingzones: str,
+    data: createStalls
 ) -> Stalls:
-
-    returning = "" if db.type == SQLITE else "RETURNING ID"
-    method = db.execute if db.type == SQLITE else db.fetchone
-
     stall_id = urlsafe_short_hash()
-    result = await (method)(
+    await db.execute(
         f"""
         INSERT INTO diagonalley.stalls (
             id,
@@ -210,9 +208,15 @@ async def create_diagonalley_stall(
             shippingzones
         )
         VALUES (?, ?, ?, ?, ?, ?, ?)
-        {returning}
         """,
-        (stall_id, wallet, name, publickey, privatekey, relays, shippingzones),
+        (
+            stall_id,
+            data.wallet,
+            data.name,
+            data.publickey,
+            data.privatekey,
+            data.relays,
+            data.shippingzones),
     )
 
     stall = await get_diagonalley_stall(stall_id)
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index bd667a2f..4c674c8a 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -13,20 +13,21 @@ from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class Stalls(BaseModel):
-    id: str = Query(None)
-    wallet: str = Query(None)
-    name: str = Query(None)
-    publickey: str = Query(None)
-    privatekey: str = Query(None)
-    relays: str = Query(None)
+    id: str
+    wallet: str
+    name: str
+    publickey: str
+    privatekey: str
+    relays: str
+    shippingzones: str
 
 class createStalls(BaseModel):
-    wallet: str = Query(None)
-    name: str = Query(None)
-    publickey: str = Query(None)
-    privatekey: str = Query(None)
-    relays: str = Query(None)
-    shippingzones: str = Query(None)
+    wallet: str = Query(...)
+    name: str = Query(...)
+    publickey: str = Query(...)
+    privatekey: str = Query(...)
+    relays: str = Query(...)
+    shippingzones: str = Query(...)
 
 class createProduct(BaseModel):
     stall: str = Query(None)
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 1ad83936..ccac9b24 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -39,7 +39,15 @@ from .crud import (
     update_diagonalley_stall,
     update_diagonalley_zone,
 )
-from .models import Orders, Products, Stalls, Zones, createProduct, createZones
+from .models import (
+    Orders,
+    Products,
+    Stalls,
+    Zones,
+    createProduct,
+    createStalls,
+    createZones,
+)
 
 # from lnbits.db import open_ext_db
 
@@ -167,33 +175,33 @@ async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(
 
 
 @diagonalley_ext.get("/api/v1/stalls")
-async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
     wallet_ids = [wallet.wallet.id]
 
-    if "all_wallets" in request.args:
+    if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([stall._asdict() for stall in await get_diagonalley_stalls(wallet_ids)])
+    return ([stall.dict() for stall in await get_diagonalley_stalls(wallet_ids)])
 
 
 @diagonalley_ext.post("/api/v1/stalls")
 @diagonalley_ext.put("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_create(data: createStalls, stall_id = None, wallet: WalletTypeInfo = Depends(get_key_type)):
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
 
         if not stall:
-            return ({"message": "Withdraw stall does not exist."}))
+            return ({"message": "Withdraw stall does not exist."})
 
         if stall.wallet != wallet.wallet.id:
-            return ({"message": "Not your withdraw stall."}))
+            return ({"message": "Not your withdraw stall."})
 
-        stall = await update_diagonalley_stall(stall_id, data)
+        stall = await update_diagonalley_stall(stall_id, **data.dict())
     else:
-        stall = await create_diagonalley_stall(wallet_id=wallet.wallet.id, data)
+        stall = await create_diagonalley_stall(data=data)
 
-    return ({**stall._asdict()}))
+    return stall.dict()
 
 
 @diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
@@ -207,7 +215,6 @@ async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: Wall
         return ({"message": "Not your Stall."})
 
     await delete_diagonalley_stall(stall_id)
-
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 

From cad896f909645e2dedfd31e45f5494648aebb7e3 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 28 Jan 2022 15:11:31 +0000
Subject: [PATCH 005/174] orders

---
 lnbits/extensions/diagonalley/crud.py      | 62 +++++++++-------------
 lnbits/extensions/diagonalley/models.py    | 28 ++++++----
 lnbits/extensions/diagonalley/views_api.py | 42 +++++++--------
 3 files changed, 65 insertions(+), 67 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 3b58b129..4cf14014 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -16,6 +16,7 @@ from .models import (
     Products,
     Stalls,
     Zones,
+    createOrder,
     createProduct,
     createStalls,
     createZones,
@@ -83,7 +84,7 @@ async def get_diagonalley_product(product_id: str) -> Optional[Products]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
     )
-    return Products.from_row(row) if row else None
+    return Products(**row) if row else None
 
 
 async def get_diagonalley_products(wallet_ids: Union[str, List[str]]) -> List[Products]:
@@ -98,7 +99,7 @@ async def get_diagonalley_products(wallet_ids: Union[str, List[str]]) -> List[Pr
         """,
         (*wallet_ids,),
     )
-    return [Products.from_row(row) for row in rows]
+    return [Products(**row) for row in rows]
 
 
 async def delete_diagonalley_product(product_id: str) -> None:
@@ -139,12 +140,12 @@ async def update_diagonalley_zone(zone_id: str, **kwargs) -> Optional[Zones]:
         (*kwargs.values(), zone_id),
     )
     row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
-    return Zones.from_row(row) if row else None
+    return Zones(**row) if row else None
 
 
 async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
     row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
-    return Zones.from_row(row) if row else None
+    return Zones(**row) if row else None
 
 
 async def get_diagonalley_zones(wallet_ids: Union[str, List[str]]) -> List[Zones]:
@@ -182,7 +183,7 @@ async def get_diagonalley_zones(wallet_ids: Union[str, List[str]]) -> List[Zones
     rows = await db.fetchall(
         f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
     )
-    return [Zones.from_row(row) for row in rows]
+    return [Zones(**row) for row in rows]
 
 
 async def delete_diagonalley_zone(zone_id: str) -> None:
@@ -233,7 +234,7 @@ async def update_diagonalley_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
-    return Stalls.from_row(row) if row else None
+    return Stalls(**row) if row else None
 
 
 async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
@@ -266,7 +267,7 @@ async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
-    return Stalls.from_row(row) if row else None
+    return Stalls(**row) if row else None
 
 
 async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
@@ -303,7 +304,7 @@ async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stal
     rows = await db.fetchall(
         f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
     )
-    return [Stalls.from_row(row) for row in rows]
+    return [Stalls(**row) for row in rows]
 
 
 async def delete_diagonalley_stall(stall_id: str) -> None:
@@ -314,47 +315,34 @@ async def delete_diagonalley_stall(stall_id: str) -> None:
 
 
 async def create_diagonalley_order(
-    *,
-    productid: str,
-    wallet: str,
-    product: str,
-    quantity: int,
-    shippingzone: str,
-    address: str,
-    email: str,
-    invoiceid: str,
-    paid: bool,
-    shipped: bool,
+    data: createOrder
 ) -> Orders:
-    returning = "" if db.type == SQLITE else "RETURNING ID"
-    method = db.execute if db.type == SQLITE else db.fetchone
 
     order_id = urlsafe_short_hash()
-    result = await (method)(
+    await db.execute(
         f"""
             INSERT INTO diagonalley.orders (id, productid, wallet, product,
             quantity, shippingzone, address, email, invoiceid, paid, shipped)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            {returning}
             """,
         (
             order_id,
-            productid,
-            wallet,
-            product,
-            quantity,
-            shippingzone,
-            address,
-            email,
-            invoiceid,
+            data.productid,
+            data.wallet,
+            data.product,
+            data.quantity,
+            data.shippingzone,
+            data.address,
+            data.email,
+            data.invoiceid,
             False,
             False,
         ),
     )
-    if db.type == SQLITE:
-        order_id = result._result_proxy.lastrowid
-    else:
-        order_id = result[0]
+    # if db.type == SQLITE:
+    #     order_id = result._result_proxy.lastrowid
+    # else:
+    #     order_id = result[0]
 
     link = await get_diagonalley_order(order_id)
     assert link, "Newly created link couldn't be retrieved"
@@ -365,7 +353,7 @@ async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
     )
-    return Orders.from_row(row) if row else None
+    return Orders(**row) if row else None
 
 
 async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
@@ -377,7 +365,7 @@ async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orde
         f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})", (*wallet_ids,)
     )
     #
-    return [Orders.from_row(row) for row in rows]
+    return [Orders(**row) for row in rows]
 
 
 async def delete_diagonalley_order(order_id: str) -> None:
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 4c674c8a..1a975e10 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -59,15 +59,25 @@ class Zones(BaseModel):
     countries: str
 
 
+class createOrder(BaseModel):
+    productid: str = Query(...)
+    stall: str = Query(...)
+    product: str = Query(...)
+    quantity: int = Query(..., ge=1)
+    shippingzone: int = Query(...)
+    address: str = Query(...)
+    email: str = Query(...)
+    invoiceid: str = Query(...)
+
 class Orders(BaseModel):
-    id: str = Query(None)
-    productid: str = Query(None)
-    stall: str = Query(None)
-    product: str = Query(None)
-    quantity: int = Query(0)
-    shippingzone: int = Query(0)
-    address: str = Query(None)
-    email: str = Query(None)
-    invoiceid: str = Query(None)
+    id: str
+    productid: str
+    stall: str
+    product: str
+    quantity: int
+    shippingzone: int
+    address: str
+    email: str
+    invoiceid: str
     paid: bool
     shipped: bool
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index ccac9b24..165d2a0c 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -44,6 +44,7 @@ from .models import (
     Products,
     Stalls,
     Zones,
+    createOrder,
     createProduct,
     createStalls,
     createZones,
@@ -87,8 +88,8 @@ async def api_diagonalley_products(
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
+    product_id, 
     data: createProduct, 
-    product_id: str = Query(None), 
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
 
@@ -186,7 +187,7 @@ async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type),
 
 @diagonalley_ext.post("/api/v1/stalls")
 @diagonalley_ext.put("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_create(data: createStalls, stall_id = None, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
@@ -222,23 +223,22 @@ async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: Wall
 
 
 @diagonalley_ext.get("/api/v1/orders")
-async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
     wallet_ids = [wallet.wallet.id]
 
-    if "all_wallets" in request.args:
+    if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
     try:
-        return ([order._asdict() for order in await get_diagonalley_orders(wallet_ids)])
+        return ([order.dict() for order in await get_diagonalley_orders(wallet_ids)])
     except:
-        return ({"message": "We could not retrieve the orders."}))
+        return ({"message": "We could not retrieve the orders."})
 
 
 @diagonalley_ext.post("/api/v1/orders")
-
-async def api_diagonalley_order_create(data: createOrders, wallet: WalletTypeInfo = Depends(get_key_type)):
-    order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data)
-    return ({**order._asdict()})
+async def api_diagonalley_order_create(data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)):
+    order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
+    return order.dict()
 
 
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
@@ -281,7 +281,7 @@ async def api_diagonalley_order_shipped(order_id: str = Query(None), wallet: Wal
         "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
     )
 
-    return ([order._asdict() for order in get_diagonalley_orders(order["wallet"])]))
+    return ([order.dict() for order in get_diagonalley_orders(order["wallet"])])
 
 
 ###List products based on stall id
@@ -303,14 +303,14 @@ async def api_diagonalley_stall_products(stall_id: str = Query(None), wallet: Wa
     if not products:
         return ({"message": "No products"})
 
-    return ([products._asdict() for products in await get_diagonalley_products(rows[1])])
+    return ([products.dict() for products in await get_diagonalley_products(rows[1])])
 
 
 ###Check a product has been shipped
 
 
 @diagonalley_ext.get("/api/v1/stall/checkshipped/{checking_id}")
-async def api_diagonalley_stall_checkshipped(checking_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_checkshipped(checking_id, wallet: WalletTypeInfo = Depends(get_key_type)):
     rows = await db.fetchone(
         "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
     )
@@ -321,19 +321,19 @@ async def api_diagonalley_stall_checkshipped(checking_id: str = Query(None), wal
 
 
 @diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
-async def api_diagonalley_stall_order(data:createOrders, wallet: WalletTypeInfo = Depends(get_key_type)):
-    product = await get_diagonalley_product(data.id)
+async def api_diagonalley_stall_order(stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)):
+    product = await get_diagonalley_product(data.productid)
     shipping = await get_diagonalley_stall(stall_id)
 
     if data.shippingzone == 1:
-        shippingcost = shipping.zone1cost
+        shippingcost = shipping.zone1cost #missing in model
     else:
-        shippingcost = shipping.zone2cost
+        shippingcost = shipping.zone2cost #missing in model
 
     checking_id, payment_request = await create_invoice(
         wallet_id=product.wallet,
         amount=shippingcost + (data.quantity * product.price),
-        memo=data.id,
+        memo=shipping.wallet,
     )
     selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
     await db.execute(
@@ -343,8 +343,8 @@ async def api_diagonalley_stall_order(data:createOrders, wallet: WalletTypeInfo
             """,
         (
             selling_id,
-            data.id,
-            product.wallet,
+            data.productid,
+            product.wallet, #doesn't exist in model
             product.product,
             data.quantity,
             data.shippingzone,
@@ -355,4 +355,4 @@ async def api_diagonalley_stall_order(data:createOrders, wallet: WalletTypeInfo
             False,
         ),
     )
-    return ({"checking_id": checking_id, "payment_request": payment_request}))
+    return ({"checking_id": checking_id, "payment_request": payment_request})

From 5048080ff671799a363e19c055ffa443c23c8f03 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 28 Jan 2022 16:22:54 +0000
Subject: [PATCH 006/174] UI fires up

---
 lnbits/extensions/diagonalley/__init__.py  | 35 +++++++++++---
 lnbits/extensions/diagonalley/tasks.py     |  6 +--
 lnbits/extensions/diagonalley/views.py     | 55 +++++++++-------------
 lnbits/extensions/diagonalley/views_api.py |  8 +---
 4 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index 720c55c8..cab65685 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -1,16 +1,37 @@
-from quart import Blueprint
+import asyncio
+
+from fastapi import APIRouter
+from fastapi.staticfiles import StaticFiles
+
 from lnbits.db import Database
+from lnbits.helpers import template_renderer
+from lnbits.tasks import catch_everything_and_restart
 
 db = Database("ext_diagonalley")
 
-diagonalley_ext: Blueprint = Blueprint(
-    "diagonalley", __name__, static_folder="static", template_folder="templates"
+diagonalley_static_files = [
+    {
+        "path": "/diagonalley/static",
+        "app": StaticFiles(directory="lnbits/extensions/diagonalley/static"),
+        "name": "diagonalley_static",
+    }
+]
+
+diagonalley_ext: APIRouter = APIRouter(
+    prefix="/diagonalley", tags=["diagonalley"]
+    # "diagonalley", __name__, static_folder="static", template_folder="templates"
 )
 
-from .views_api import *  # noqa
+def diagonalley_renderer():
+    return template_renderer(["lnbits/extensions/diagonalley/templates"])
+
+
+from .tasks import wait_for_paid_invoices
 from .views import *  # noqa
+from .views_api import *  # noqa
 
-from .tasks import register_listeners
-from lnbits.tasks import record_async
 
-diagonalley_ext.record(record_async(register_listeners))
+def diagonalley_start():
+    loop = asyncio.get_event_loop()
+    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
+
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/diagonalley/tasks.py
index 3fee63d9..bcbb7025 100644
--- a/lnbits/extensions/diagonalley/tasks.py
+++ b/lnbits/extensions/diagonalley/tasks.py
@@ -3,8 +3,6 @@ import asyncio
 from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
 
-from .crud import get_ticket, set_ticket_paid
-
 
 async def wait_for_paid_invoices():
     invoice_queue = asyncio.Queue()
@@ -16,6 +14,7 @@ async def wait_for_paid_invoices():
 
 
 async def on_invoice_paid(payment: Payment) -> None:
+    """
     if "lnticket" != payment.extra.get("tag"):
         # not a lnticket invoice
         return
@@ -26,4 +25,5 @@ async def on_invoice_paid(payment: Payment) -> None:
         return
 
     await payment.set_pending(False)
-    await set_ticket_paid(payment.payment_hash)
\ No newline at end of file
+    await set_ticket_paid(payment.payment_hash)
+    """
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 2deed72b..ae0899ca 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -1,44 +1,35 @@
 
-from typing import List
-
-from fastapi import Request, WebSocket, WebSocketDisconnect
-from fastapi.params import Depends
-from fastapi.templating import Jinja2Templates
-from starlette.responses import HTMLResponse  # type: ignore
-
 from http import HTTPStatus
-import json
-from lnbits.decorators import check_user_exists, validate_uuids
-from lnbits.extensions.diagonalley import diagonalley_ext
 
-from .crud import (
-    create_diagonalley_product,
-    get_diagonalley_product,
-    get_diagonalley_products,
-    delete_diagonalley_product,
-    create_diagonalley_order,
-    get_diagonalley_order,
-    get_diagonalley_orders,
-    update_diagonalley_product,
-)
+from fastapi import Request
+from fastapi.params import Depends
+from fastapi.templating import Jinja2Templates
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
 
+from lnbits.core.models import User
+from lnbits.decorators import check_user_exists  # type: ignore
+from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
+
+from .crud import get_diagonalley_products
+
+templates = Jinja2Templates(directory="templates")
 
 @diagonalley_ext.get("/", response_class=HTMLResponse)
-@validate_uuids(["usr"], required=True)
-@check_user_exists(request: Request)
-async def index():
-    return await render_template("diagonalley/index.html", user=g.user)
+async def index(request: Request, user: User = Depends(check_user_exists)):
+    return diagonalley_renderer().TemplateResponse(
+        "diagonalley/index.html", {"request": request, "user": user.dict()}
+    )
 
-
-@diagonalley_ext.get("/<stall_id>", response_class=HTMLResponse)
+@diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
     product = await get_diagonalley_products(stall_id)
+    
     if not product:
-        abort(HTTPStatus.NOT_FOUND, "Stall does not exist.")
-
-    return await render_template(
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
+        )
+    return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
-        stall=json.dumps(
-            [product._asdict() for product in await get_diagonalley_products(stall_id)]
-        ),
+        {"stall": [product.dict() for product in await get_diagonalley_products(stall_id)]}
     )
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 165d2a0c..43232841 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -9,13 +9,7 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
-from lnbits.decorators import (
-    WalletTypeInfo,
-    api_check_wallet_key,
-    api_validate_post_request,
-    get_key_type,
-    require_admin_key,
-)
+from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
 
 from . import db, diagonalley_ext
 from .crud import (

From 301135d0064d378843ad997124fcfbb169520e0c Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 3 Feb 2022 21:19:24 +0000
Subject: [PATCH 007/174] Message ui working

---
 .../extensions/diagonalley/static/js/index.js | 83 ++++++++++++-------
 .../templates/diagonalley/index.html          | 47 ++++++-----
 2 files changed, 78 insertions(+), 52 deletions(-)

diff --git a/lnbits/extensions/diagonalley/static/js/index.js b/lnbits/extensions/diagonalley/static/js/index.js
index 1a25edaa..af81db2a 100644
--- a/lnbits/extensions/diagonalley/static/js/index.js
+++ b/lnbits/extensions/diagonalley/static/js/index.js
@@ -2,7 +2,24 @@
 
 Vue.component(VueQrcode.name, VueQrcode)
 
-const pica = window.pica()
+//const pica = window.pica()
+
+var mapStalls = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapProducts = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapZone = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapOrders = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
 
 new Vue({
   el: '#vue',
@@ -13,6 +30,9 @@ new Vue({
       orders: [],
       stalls: [],
       zones: [],
+      customerKeys: [],
+      customerKey: '',
+      customerMessages: {},
       shippedModel: false,
       shippingZoneOptions: [
         'Australia',
@@ -64,7 +84,8 @@ new Vue({
         'Groceries (Food and Drink)',
         'Technology (Phones and Computers)',
         'Home (furniture and accessories)',
-        'Gifts (flowers, cards, etc)'
+        'Gifts (flowers, cards, etc)',
+        'Adult'
       ],
       relayOptions: [
         'wss://nostr-relay.herokuapp.com/ws',
@@ -244,6 +265,17 @@ new Vue({
     }
   },
   methods: {
+    ////////////////////////////////////////
+    ///////////SUPPORT MESSAGES/////////////
+    ////////////////////////////////////////
+    getMessages: function (customerKey) {
+      var self = this
+      console.log('fuck')
+      messages = []
+      messages.push(['in', 'blah blah'])
+      messages.push(['out', 'blah blah'])
+      self.customerMessages = messages
+    },
     ////////////////////////////////////////
     ////////////////STALLS//////////////////
     ////////////////////////////////////////
@@ -256,10 +288,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.stalls = response.data.map(function (obj) {
-            console.log(obj)
-            return mapDiagonAlley(obj)
-          })
+          self.stalls.push(mapStalls(response.data))
         })
     },
     openStallUpdateDialog: function (linkId) {
@@ -302,7 +331,7 @@ new Vue({
           self.stalls = _.reject(self.stalls, function (obj) {
             return obj.id == data.id
           })
-          self.stalls.push(mapDiagonAlley(response.data))
+          self.stalls.push(mapStalls(response.data))
           self.stallDialog.show = false
           self.stallDialog.data = {}
           data = {}
@@ -323,7 +352,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.stalls.push(mapDiagonAlley(response.data))
+          self.stalls.push(mapStalls(response.data))
           self.stallDialog.show = false
           self.stallDialog.data = {}
           data = {}
@@ -371,9 +400,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.products = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.products.push(mapProducts(response.data))
         })
     },
     openProductUpdateDialog: function (linkId) {
@@ -450,7 +477,7 @@ new Vue({
           self.products = _.reject(self.products, function (obj) {
             return obj.id == data.id
           })
-          self.products.push(mapDiagonAlley(response.data))
+          self.products.push(mapProducts(response.data))
           self.productDialog.show = false
           self.productDialog.data = {}
         })
@@ -470,7 +497,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.products.push(mapDiagonAlley(response.data))
+          self.products.push(mapProducts(response.data))
           self.productDialog.show = false
           self.productDialog.data = {}
         })
@@ -517,9 +544,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.zones = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.zones.push(mapZone(response.data))
         })
     },
     openZoneUpdateDialog: function (linkId) {
@@ -559,7 +584,7 @@ new Vue({
           self.zones = _.reject(self.zones, function (obj) {
             return obj.id == data.id
           })
-          self.zones.push(mapDiagonAlley(response.data))
+          self.zones.push(mapZone(response.data))
           self.zoneDialog.show = false
           self.zoneDialog.data = {}
           data = {}
@@ -580,7 +605,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.zones.push(mapDiagonAlley(response.data))
+          self.zones.push(mapZone(response.data))
           self.zoneDialog.show = false
           self.zoneDialog.data = {}
           data = {}
@@ -628,9 +653,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.shops = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.shops.push(mapShops(response.data))
         })
     },
     openShopUpdateDialog: function (linkId) {
@@ -670,7 +693,7 @@ new Vue({
           self.shops = _.reject(self.shops, function (obj) {
             return obj.id == data.id
           })
-          self.shops.push(mapDiagonAlley(response.data))
+          self.shops.push(mapShops(response.data))
           self.shopDialog.show = false
           self.shopDialog.data = {}
           data = {}
@@ -692,7 +715,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.shops.push(mapDiagonAlley(response.data))
+          self.shops.push(mapShops(response.data))
           self.shopDialog.show = false
           self.shopDialog.data = {}
           data = {}
@@ -740,9 +763,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.orders = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.orders.push(mapOrders(response.data))
         })
     },
     createOrder: function () {
@@ -763,7 +784,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.orders.push(mapDiagonAlley(response.data))
+          self.orders.push(mapOrders(response.data))
           self.orderDialog.show = false
           self.orderDialog.data = {}
         })
@@ -804,9 +825,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.orders = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.orders.push(mapOrders(response.data))
         })
     },
     exportOrdersCSV: function () {
@@ -819,6 +838,10 @@ new Vue({
       this.getProducts()
       this.getZones()
       this.getOrders()
+      this.customerKeys = [
+        'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
+        'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
+      ]
     }
   }
 })
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 98405f6d..a89c8b5e 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -594,34 +594,37 @@
     </q-card>
     <q-card>
       <q-card-section>
-        <h6 class="text-subtitle1 q-my-none">Messages (example)</h6>
+        <h6 class="text-subtitle1 q-my-none">Messages</h6>
       </q-card-section>
       <q-card-section class="q-pa-none" >
         <q-separator></q-separator>
 
-        <div class="row q-pa-md">
-          <div class="col-4">
-            <q-btn outline color="primary" size="md" style="height: 90px; width:90%"
-              >OrderID:87h87h<br/>KJBIBYBUYBUF90898....</q-btn
-            >
-            <q-btn outline color="primary" size="md" style="height: 90px; width:90%"
-              >OrderID:NIUHB7<br/>79867KJGJHGVFYFV....</q-btn
-            >
+        <div class="column q-ma-md q-pb-lg" 
+         style="height: 350px">
+          <div class="col q-pb-md">
+            <q-select v-model="customerKey" style="width: 80%;"
+        :options="customerKeys" label="Customers" @input="getMessages(customerKey)"></q-select>
           </div>
-          <div class="col-8">
-            <div style="height: 350px">
-            <q-chat-message
-              :text="['I have not received my Welsh Cakes']"
-              sent
-            ></q-chat-message>
-            <q-chat-message
-              :text="['Yep, its Brexit. They are stuck in customs. We will have to wait it out. I can offer a full refund?']"
-            ></q-chat-message>
+          <div class="col-8 q-px-md">
+            <div v-for="message in customerMessages">
+              <q-chat-message
+                v-if="message[0] == 'out'"
+                :text="[message[1]]"
+                sent
+              ></q-chat-message>
+              <q-chat-message
+                v-else
+                :text="[message[1]]"
+              ></q-chat-message>
+          </div>
+          </div>
+          <div class="col on-right	" style="width: 90%">
+            <q-input >
+              <template v-slot:after>
+                <q-btn round dense flat icon="send" />
+              </template>
+            </q-input>
           </div>
-            <q-input ><template v-slot:after>
-              <q-btn round dense flat icon="send" />
-            </template></q-input>
-            
         </div>
       </q-card-section>
     </q-card>

From ecaea51a1ce5f98c585b58caf2b0c16f2eb8a75b Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 3 Feb 2022 22:30:53 +0000
Subject: [PATCH 008/174] Added error messages

---
 lnbits/extensions/diagonalley/static/js/index.js    |  6 ++++++
 .../diagonalley/templates/diagonalley/index.html    | 13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/diagonalley/static/js/index.js b/lnbits/extensions/diagonalley/static/js/index.js
index af81db2a..d101bfcf 100644
--- a/lnbits/extensions/diagonalley/static/js/index.js
+++ b/lnbits/extensions/diagonalley/static/js/index.js
@@ -265,6 +265,12 @@ new Vue({
     }
   },
   methods: {
+    errorMessage: function (error) {
+      this.$q.notify({
+        color: 'primary',
+        message: error
+      })
+    },
     ////////////////////////////////////////
     ///////////SUPPORT MESSAGES/////////////
     ////////////////////////////////////////
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index a89c8b5e..d14d7cee 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -300,13 +300,20 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="primary" @click="productDialog.show = true"
+        <q-btn unelevated v-if="stalls.length === 0" color="primary" @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
+        >
+        <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated color="primary" @click="stallDialog.show = true"
+        <q-btn unelevated v-if="zones.length === 0" color="primary" @click="stallDialog.show = true"
+          >+ Stall
+          <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
+        >
+        <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s).')"
           >+ Stall
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
@@ -618,7 +625,7 @@
               ></q-chat-message>
           </div>
           </div>
-          <div class="col on-right	" style="width: 90%">
+          <div class="col on-right" style="width: 90%">
             <q-input >
               <template v-slot:after>
                 <q-btn round dense flat icon="send" />

From 44f7fae2d4035f9757d9f6836e59be68b09c987c Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Fri, 4 Feb 2022 13:05:48 +0000
Subject: [PATCH 009/174] Zones are saving/updating

---
 lnbits/extensions/diagonalley/__init__.py     |  11 +-
 lnbits/extensions/diagonalley/crud.py         | 116 +--
 lnbits/extensions/diagonalley/migrations.py   |   8 +-
 lnbits/extensions/diagonalley/models.py       |   7 +-
 .../extensions/diagonalley/static/js/index.js | 853 -----------------
 .../templates/diagonalley/index.html          | 895 +++++++++++++++++-
 lnbits/extensions/diagonalley/views_api.py    |  40 +-
 7 files changed, 924 insertions(+), 1006 deletions(-)
 delete mode 100644 lnbits/extensions/diagonalley/static/js/index.js

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index cab65685..388c08db 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -9,17 +9,9 @@ from lnbits.tasks import catch_everything_and_restart
 
 db = Database("ext_diagonalley")
 
-diagonalley_static_files = [
-    {
-        "path": "/diagonalley/static",
-        "app": StaticFiles(directory="lnbits/extensions/diagonalley/static"),
-        "name": "diagonalley_static",
-    }
-]
 
 diagonalley_ext: APIRouter = APIRouter(
     prefix="/diagonalley", tags=["diagonalley"]
-    # "diagonalley", __name__, static_folder="static", template_folder="templates"
 )
 
 def diagonalley_renderer():
@@ -33,5 +25,4 @@ from .views_api import *  # noqa
 
 def diagonalley_start():
     loop = asyncio.get_event_loop()
-    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
-
+    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
\ No newline at end of file
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 4cf14014..d2df427c 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -22,28 +22,12 @@ from .models import (
     createZones,
 )
 
-regex = re.compile(
-    r"^(?:http|ftp)s?://"  # http:// or https://
-    r"(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|"
-    r"localhost|"
-    r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})"
-    r"(?::\d+)?"
-    r"(?:/?|[/?]\S+)$",
-    re.IGNORECASE,
-)
-
-
 ###Products
 
-
 async def create_diagonalley_product(
     data: createProduct
 ) -> Products:
-    # returning = "" if db.type == SQLITE else "RETURNING ID"
-    # method = db.execute if db.type == SQLITE else db.fetchone
     product_id = urlsafe_short_hash()
-    # with open_ext_db("diagonalley") as db:
-    # result = await (method)(
     await db.execute(
         f"""
         INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity)
@@ -110,7 +94,7 @@ async def delete_diagonalley_product(product_id: str) -> None:
 
 
 async def create_diagonalley_zone(
-    wallet,
+    user,
     data: createZones
 ) -> Zones:
     zone_id = urlsafe_short_hash()
@@ -118,14 +102,14 @@ async def create_diagonalley_zone(
         f"""
         INSERT INTO diagonalley.zones (
             id,
-            wallet,
+            user,
             cost,
             countries
 
         )
         VALUES (?, ?, ?, ?)
         """,
-        (zone_id, wallet, data.cost, data.countries),
+        (zone_id, user, data.cost, data.countries.lower()),
     )
 
     zone = await get_diagonalley_zone(zone_id)
@@ -148,41 +132,8 @@ async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
     return Zones(**row) if row else None
 
 
-async def get_diagonalley_zones(wallet_ids: Union[str, List[str]]) -> List[Zones]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
-        print(wallet_ids)
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
-    )
-
-    for r in rows:
-        try:
-            x = httpx.get(r["zoneaddress"] + "/" + r["ratingkey"])
-            if x.status_code == 200:
-                await db.execute(
-                    "UPDATE diagonalley.zones SET online = ? WHERE id = ?",
-                    (
-                        True,
-                        r["id"],
-                    ),
-                )
-            else:
-                await db.execute(
-                    "UPDATE diagonalley.zones SET online = ? WHERE id = ?",
-                    (
-                        False,
-                        r["id"],
-                    ),
-                )
-        except:
-            print("An exception occurred")
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
-    )
+async def get_diagonalley_zones(user: str) -> List[Zones]:
+    rows = await db.fetchall("SELECT * FROM diagonalley.zones WHERE user = ?", (user,))
     return [Zones(**row) for row in rows]
 
 
@@ -217,7 +168,7 @@ async def create_diagonalley_stall(
             data.publickey,
             data.privatekey,
             data.relays,
-            data.shippingzones),
+            repr(data.shippingzones)),
     )
 
     stall = await get_diagonalley_stall(stall_id)
@@ -238,32 +189,6 @@ async def update_diagonalley_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
 
 
 async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
-    roww = await db.fetchone(
-        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
-    )
-
-    try:
-        x = httpx.get(roww["stalladdress"] + "/" + roww["ratingkey"])
-        if x.status_code == 200:
-            await db.execute(
-                "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
-                (
-                    True,
-                    stall_id,
-                ),
-            )
-        else:
-            await db.execute(
-                "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
-                (
-                    False,
-                    stall_id,
-                ),
-            )
-    except:
-        print("An exception occurred")
-
-    # with open_ext_db("diagonalley") as db:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
@@ -271,35 +196,6 @@ async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
 
 
 async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
-    )
-
-    for r in rows:
-        try:
-            x = httpx.get(r["stalladdress"] + "/" + r["ratingkey"])
-            if x.status_code == 200:
-                await db.execute(
-                    "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
-                    (
-                        True,
-                        r["id"],
-                    ),
-                )
-            else:
-                await db.execute(
-                    "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
-                    (
-                        False,
-                        r["id"],
-                    ),
-                )
-        except:
-            print("An exception occurred")
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
         f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 1523f398..29a84419 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -28,7 +28,8 @@ async def m001_initial(db):
             name TEXT NOT NULL,
             publickey TEXT NOT NULL,
             privatekey TEXT NOT NULL,
-            relays TEXT NOT NULL
+            relays TEXT NOT NULL,
+            shippingzones TEXT NOT NULL
         );
     """
     )
@@ -40,7 +41,7 @@ async def m001_initial(db):
         """
         CREATE TABLE diagonalley.zones (
             id TEXT PRIMARY KEY,
-            wallet TEXT NOT NULL,
+            user TEXT NOT NULL,
             cost TEXT NOT NULL,
             countries TEXT NOT NULL
         );
@@ -55,7 +56,8 @@ async def m001_initial(db):
         CREATE TABLE diagonalley.orders (
             id TEXT PRIMARY KEY,
             productid TEXT NOT NULL,
-            wallet TEXT NOT NULL,
+            usr TEXT NOT NULL,
+            pubkey TEXT NOT NULL,
             product TEXT NOT NULL,
             quantity INTEGER NOT NULL,
             shippingzone INTEGER NOT NULL,
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 1a975e10..743c2068 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -49,13 +49,13 @@ class Products(BaseModel):
     quantity: int
 
 class createZones(BaseModel):
-    cost: str = Query(None)
+    cost: int = Query(0, ge=0)
     countries: str = Query(None)
 
 class Zones(BaseModel):
     id: str
-    wallet: str
-    cost: str
+    user: str
+    cost: int
     countries: str
 
 
@@ -73,6 +73,7 @@ class Orders(BaseModel):
     id: str
     productid: str
     stall: str
+    pubkey: str
     product: str
     quantity: int
     shippingzone: int
diff --git a/lnbits/extensions/diagonalley/static/js/index.js b/lnbits/extensions/diagonalley/static/js/index.js
deleted file mode 100644
index d101bfcf..00000000
--- a/lnbits/extensions/diagonalley/static/js/index.js
+++ /dev/null
@@ -1,853 +0,0 @@
-/* globals Quasar, Vue, _, VueQrcode, windowMixin, LNbits, LOCALE */
-
-Vue.component(VueQrcode.name, VueQrcode)
-
-//const pica = window.pica()
-
-var mapStalls = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-var mapProducts = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-var mapZone = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-var mapOrders = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-
-new Vue({
-  el: '#vue',
-  mixins: [windowMixin],
-  data: function () {
-    return {
-      products: [],
-      orders: [],
-      stalls: [],
-      zones: [],
-      customerKeys: [],
-      customerKey: '',
-      customerMessages: {},
-      shippedModel: false,
-      shippingZoneOptions: [
-        'Australia',
-        'Austria',
-        'Belgium',
-        'Brazil',
-        'Canada',
-        'Denmark',
-        'Finland',
-        'France*',
-        'Germany',
-        'Greece',
-        'Hong Kong',
-        'Hungary',
-        'Ireland',
-        'Indonesia',
-        'Israel',
-        'Italy',
-        'Japan',
-        'Kazakhstan',
-        'Korea',
-        'Luxembourg',
-        'Malaysia',
-        'Mexico',
-        'Netherlands',
-        'New Zealand',
-        'Norway',
-        'Poland',
-        'Portugal',
-        'Russia',
-        'Saudi Arabia',
-        'Singapore',
-        'Spain',
-        'Sweden',
-        'Switzerland',
-        'Thailand',
-        'Turkey',
-        'Ukraine',
-        'United Kingdom**',
-        'United States***',
-        'Vietnam',
-        'China'
-      ],
-      categories: [
-        'Fashion (clothing and accessories)',
-        'Health (and beauty)',
-        'Toys (and baby equipment)',
-        'Media (Books and CDs)',
-        'Groceries (Food and Drink)',
-        'Technology (Phones and Computers)',
-        'Home (furniture and accessories)',
-        'Gifts (flowers, cards, etc)',
-        'Adult'
-      ],
-      relayOptions: [
-        'wss://nostr-relay.herokuapp.com/ws',
-        'wss://nostr-relay.bigsun.xyz/ws',
-        'wss://freedom-relay.herokuapp.com/ws'
-      ],
-      label: '',
-      ordersTable: {
-        columns: [
-          {
-            name: 'product',
-            align: 'left',
-            label: 'Product',
-            field: 'product'
-          },
-          {
-            name: 'quantity',
-            align: 'left',
-            label: 'Quantity',
-            field: 'quantity'
-          },
-          {
-            name: 'address',
-            align: 'left',
-            label: 'Address',
-            field: 'address'
-          },
-          {
-            name: 'invoiceid',
-            align: 'left',
-            label: 'InvoiceID',
-            field: 'invoiceid'
-          },
-          {name: 'paid', align: 'left', label: 'Paid', field: 'paid'},
-          {name: 'shipped', align: 'left', label: 'Shipped', field: 'shipped'}
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      productsTable: {
-        columns: [
-          {
-            name: 'stall',
-            align: 'left',
-            label: 'Stall',
-            field: 'stall'
-          },
-          {
-            name: 'product',
-            align: 'left',
-            label: 'Product',
-            field: 'product'
-          },
-          {
-            name: 'description',
-            align: 'left',
-            label: 'Description',
-            field: 'description'
-          },
-          {
-            name: 'categories',
-            align: 'left',
-            label: 'Categories',
-            field: 'categories'
-          },
-          {name: 'price', align: 'left', label: 'Price', field: 'price'},
-          {
-            name: 'quantity',
-            align: 'left',
-            label: 'Quantity',
-            field: 'quantity'
-          },
-          {name: 'id', align: 'left', label: 'ID', field: 'id'}
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      stallTable: {
-        columns: [
-          {
-            name: 'id',
-            align: 'left',
-            label: 'ID',
-            field: 'id'
-          },
-          {
-            name: 'name',
-            align: 'left',
-            label: 'Name',
-            field: 'name'
-          },
-          {
-            name: 'wallet',
-            align: 'left',
-            label: 'Wallet',
-            field: 'wallet'
-          },
-          {
-            name: 'publickey',
-            align: 'left',
-            label: 'Public key',
-            field: 'publickey'
-          },
-          {
-            name: 'privatekey',
-            align: 'left',
-            label: 'Private key',
-            field: 'privatekey'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      zonesTable: {
-        columns: [
-          {
-            name: 'id',
-            align: 'left',
-            label: 'ID',
-            field: 'id'
-          },
-          {
-            name: 'countries',
-            align: 'left',
-            label: 'Countries',
-            field: 'countries'
-          },
-          {
-            name: 'cost',
-            align: 'left',
-            label: 'Cost',
-            field: 'cost'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      productDialog: {
-        show: false,
-        data: {}
-      },
-      stallDialog: {
-        show: false,
-        data: {}
-      },
-      zoneDialog: {
-        show: false,
-        data: {}
-      },
-      shopDialog: {
-        show: false,
-        data: {activate: false}
-      },
-      orderDialog: {
-        show: false,
-        data: {}
-      },
-      relayDialog: {
-        show: false,
-        data: {}
-      }
-    }
-  },
-  computed: {
-    categoryOther: function () {
-      cats = trim(this.productDialog.data.categories.split(','))
-      for (let i = 0; i < cats.length; i++) {
-        if (cats[i] == 'Others') {
-          return true
-        }
-      }
-      return false
-    }
-  },
-  methods: {
-    errorMessage: function (error) {
-      this.$q.notify({
-        color: 'primary',
-        message: error
-      })
-    },
-    ////////////////////////////////////////
-    ///////////SUPPORT MESSAGES/////////////
-    ////////////////////////////////////////
-    getMessages: function (customerKey) {
-      var self = this
-      console.log('fuck')
-      messages = []
-      messages.push(['in', 'blah blah'])
-      messages.push(['out', 'blah blah'])
-      self.customerMessages = messages
-    },
-    ////////////////////////////////////////
-    ////////////////STALLS//////////////////
-    ////////////////////////////////////////
-    getStalls: function () {
-      var self = this
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/stalls?all_wallets',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.stalls.push(mapStalls(response.data))
-        })
-    },
-    openStallUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.stalls, {id: linkId})
-
-      this.stallDialog.data = _.clone(link._data)
-      this.stallDialog.show = true
-    },
-    sendStallFormData: function () {
-      if (this.stallDialog.data.id) {
-      } else {
-        var data = {
-          name: this.stallDialog.data.name,
-          wallet: this.stallDialog.data.wallet,
-          publickey: this.stallDialog.data.publickey,
-          privatekey: this.stallDialog.data.privatekey,
-          relays: this.stallDialog.data.relays
-        }
-      }
-
-      if (this.stallDialog.data.id) {
-        this.updateStall(this.stallDialog.data)
-      } else {
-        this.createStall(data)
-      }
-    },
-    updateStall: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/stalls' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.stallDialog.data.wallet
-          }).inkey,
-          _.pick(data, 'name', 'wallet', 'publickey', 'privatekey')
-        )
-        .then(function (response) {
-          self.stalls = _.reject(self.stalls, function (obj) {
-            return obj.id == data.id
-          })
-          self.stalls.push(mapStalls(response.data))
-          self.stallDialog.show = false
-          self.stallDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createStall: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/stalls',
-          _.findWhere(self.g.user.wallets, {
-            id: self.stallDialog.data.wallet
-          }).inkey,
-          data
-        )
-        .then(function (response) {
-          self.stalls.push(mapStalls(response.data))
-          self.stallDialog.show = false
-          self.stallDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteStall: function (stallId) {
-      var self = this
-      var stall = _.findWhere(self.stalls, {id: stallId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Stall link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/stalls/' + stallId,
-              _.findWhere(self.g.user.wallets, {id: stall.wallet}).inkey
-            )
-            .then(function (response) {
-              self.stalls = _.reject(self.stalls, function (obj) {
-                return obj.id == stallId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportStallsCSV: function () {
-      LNbits.utils.exportCSV(this.stallsTable.columns, this.stalls)
-    },
-    ////////////////////////////////////////
-    ///////////////PRODUCTS/////////////////
-    ////////////////////////////////////////
-    getProducts: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/products?all_stalls',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.products.push(mapProducts(response.data))
-        })
-    },
-    openProductUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.products, {id: linkId})
-
-      self.productDialog.data = _.clone(link._data)
-      self.productDialog.show = true
-    },
-    sendProductFormData: function () {
-      if (this.productDialog.data.id) {
-      } else {
-        var data = {
-          product: this.productDialog.data.product,
-          categories:
-            this.productDialog.data.categories +
-            this.productDialog.categoriesextra,
-          description: this.productDialog.data.description,
-          image: this.productDialog.data.image,
-          price: this.productDialog.data.price,
-          quantity: this.productDialog.data.quantity
-        }
-      }
-      if (this.productDialog.data.id) {
-        this.updateProduct(this.productDialog.data)
-      } else {
-        this.createProduct(data)
-      }
-    },
-    imageAdded(file) {
-      let blobURL = URL.createObjectURL(file)
-      let image = new Image()
-      image.src = blobURL
-      image.onload = async () => {
-        let canvas = document.createElement('canvas')
-        canvas.setAttribute('width', 100)
-        canvas.setAttribute('height', 100)
-        await pica.resize(image, canvas, {
-          quality: 0,
-          alpha: true,
-          unsharpAmount: 95,
-          unsharpRadius: 0.9,
-          unsharpThreshold: 70
-        })
-        this.productDialog.data.image = canvas.toDataURL()
-        this.productDialog = {...this.productDialog}
-      }
-    },
-    imageCleared() {
-      this.productDialog.data.image = null
-      this.productDialog = {...this.productDialog}
-    },
-    updateProduct: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/products' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.productDialog.data.wallet
-          }).inkey,
-          _.pick(
-            data,
-            'shopname',
-            'relayaddress',
-            'shippingzone1',
-            'zone1cost',
-            'shippingzone2',
-            'zone2cost',
-            'email'
-          )
-        )
-        .then(function (response) {
-          self.products = _.reject(self.products, function (obj) {
-            return obj.id == data.id
-          })
-          self.products.push(mapProducts(response.data))
-          self.productDialog.show = false
-          self.productDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createProduct: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/products',
-          _.findWhere(self.g.user.wallets, {
-            id: self.productDialog.data.wallet
-          }).inkey,
-          data
-        )
-        .then(function (response) {
-          self.products.push(mapProducts(response.data))
-          self.productDialog.show = false
-          self.productDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteProduct: function (productId) {
-      var self = this
-      var product = _.findWhere(this.products, {id: productId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this products link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/products/' + productId,
-              _.findWhere(self.g.user.wallets, {id: product.wallet}).inkey
-            )
-            .then(function (response) {
-              self.products = _.reject(self.products, function (obj) {
-                return obj.id == productId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportProductsCSV: function () {
-      LNbits.utils.exportCSV(this.productsTable.columns, this.products)
-    },
-    ////////////////////////////////////////
-    //////////////////ZONE//////////////////
-    ////////////////////////////////////////
-    getZones: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/zones?all_wallets',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.zones.push(mapZone(response.data))
-        })
-    },
-    openZoneUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.zones, {id: linkId})
-
-      this.zoneDialog.data = _.clone(link._data)
-      this.zoneDialog.show = true
-    },
-    sendZoneFormData: function () {
-      if (this.zoneDialog.data.id) {
-      } else {
-        var data = {
-          countries: toString(this.zoneDialog.data.countries),
-          cost: parseInt(this.zoneDialog.data.cost)
-        }
-      }
-
-      if (this.zoneDialog.data.id) {
-        this.updateZone(this.zoneDialog.data)
-      } else {
-        this.createZone(data)
-      }
-    },
-    updateZone: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/zones' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.zoneDialog.data.wallet
-          }).inkey,
-          _.pick(data, 'countries', 'cost')
-        )
-        .then(function (response) {
-          self.zones = _.reject(self.zones, function (obj) {
-            return obj.id == data.id
-          })
-          self.zones.push(mapZone(response.data))
-          self.zoneDialog.show = false
-          self.zoneDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createZone: function (data) {
-      var self = this
-      console.log(self.g.user.wallets[0])
-      console.log(data)
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/zones',
-          self.g.user.wallets[0].inkey,
-          data
-        )
-        .then(function (response) {
-          self.zones.push(mapZone(response.data))
-          self.zoneDialog.show = false
-          self.zoneDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteZone: function (zoneId) {
-      var self = this
-      var zone = _.findWhere(self.zones, {id: zoneId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Zone link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/zones/' + zoneId,
-              _.findWhere(self.g.user.wallets, {id: zone.wallet}).inkey
-            )
-            .then(function (response) {
-              self.zones = _.reject(self.zones, function (obj) {
-                return obj.id == zoneId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportZonesCSV: function () {
-      LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
-    },
-    ////////////////////////////////////////
-    //////////////////SHOP//////////////////
-    ////////////////////////////////////////
-    getShops: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/shops?all_wallets',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.shops.push(mapShops(response.data))
-        })
-    },
-    openShopUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.shops, {id: linkId})
-
-      this.shopDialog.data = _.clone(link._data)
-      this.shopDialog.show = true
-    },
-    sendShopFormData: function () {
-      if (this.shopDialog.data.id) {
-      } else {
-        var data = {
-          countries: this.shopDialog.data.countries,
-          cost: this.shopDialog.data.cost
-        }
-      }
-
-      if (this.shopDialog.data.id) {
-        this.updateZone(this.shopDialog.data)
-      } else {
-        this.createZone(data)
-      }
-    },
-    updateShop: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/shops' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.shopDialog.data.wallet
-          }).inkey,
-          _.pick(data, 'countries', 'cost')
-        )
-        .then(function (response) {
-          self.shops = _.reject(self.shops, function (obj) {
-            return obj.id == data.id
-          })
-          self.shops.push(mapShops(response.data))
-          self.shopDialog.show = false
-          self.shopDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createShop: function (data) {
-      var self = this
-      console.log('cuntywoo')
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/shops',
-          _.findWhere(self.g.user.wallets, {
-            id: self.shopDialog.data.wallet
-          }).inkey,
-          data
-        )
-        .then(function (response) {
-          self.shops.push(mapShops(response.data))
-          self.shopDialog.show = false
-          self.shopDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteShop: function (shopId) {
-      var self = this
-      var shop = _.findWhere(self.shops, {id: shopId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Shop link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/shops/' + shopId,
-              _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
-            )
-            .then(function (response) {
-              self.shops = _.reject(self.shops, function (obj) {
-                return obj.id == shopId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportShopsCSV: function () {
-      LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
-    },
-    ////////////////////////////////////////
-    ////////////////ORDERS//////////////////
-    ////////////////////////////////////////
-    getOrders: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/orders?all_wallets',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.orders.push(mapOrders(response.data))
-        })
-    },
-    createOrder: function () {
-      var data = {
-        address: this.orderDialog.data.address,
-        email: this.orderDialog.data.email,
-        quantity: this.orderDialog.data.quantity,
-        shippingzone: this.orderDialog.data.shippingzone
-      }
-      var self = this
-
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/orders',
-          _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
-            .inkey,
-          data
-        )
-        .then(function (response) {
-          self.orders.push(mapOrders(response.data))
-          self.orderDialog.show = false
-          self.orderDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteOrder: function (orderId) {
-      var self = this
-      var order = _.findWhere(self.orders, {id: orderId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this order link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/orders/' + orderId,
-              _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
-            )
-            .then(function (response) {
-              self.orders = _.reject(self.orders, function (obj) {
-                return obj.id == orderId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    shipOrder: function (order_id) {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/orders/shipped/' + order_id,
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.orders.push(mapOrders(response.data))
-        })
-    },
-    exportOrdersCSV: function () {
-      LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
-    }
-  },
-  created: function () {
-    if (this.g.user.wallets.length) {
-      this.getStalls()
-      this.getProducts()
-      this.getZones()
-      this.getOrders()
-      this.customerKeys = [
-        'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
-        'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
-      ]
-    }
-  }
-})
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index d14d7cee..7b8f8e6a 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -300,8 +300,9 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated v-if="stalls.length === 0" color="primary" @click="productDialog.show = true"
-          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
+      
+        <q-btn unelevated v-if="stalls.length === 1" color="primary" @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a produc </q-tooltip></q-btn
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
@@ -309,7 +310,7 @@
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated v-if="zones.length === 0" color="primary" @click="stallDialog.show = true"
+        <q-btn unelevated v-if="zones.length === 1" color="primary" @click="stallDialog.show = true"
           >+ Stall
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
@@ -321,6 +322,7 @@
           >Launch frontend shop (not Nostr)
           <q-tooltip> Makes a simple frontend shop for your stalls</q-tooltip></q-btn
         >
+      
       </q-card-section>
     </q-card>
 
@@ -638,7 +640,890 @@
   </div>
   </div>
 </div>
+</div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
-<script src="/diagonalley/static/js/index.js"></script>
+
+<script>
+
+Vue.component(VueQrcode.name, VueQrcode)
+
+//const pica = window.pica()
+
+var mapStalls = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapProducts = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapZone = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapOrders = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+
+new Vue({
+  el: '#vue',
+  mixins: [windowMixin],
+  data: function () {
+    return {
+      products: [],
+      orders: [],
+      stalls: [],
+      zones: [],
+      customerKeys: [],
+      customerKey: '',
+      customerMessages: {},
+      shippedModel: false,
+      shippingZoneOptions: [
+        'Australia',
+        'Austria',
+        'Belgium',
+        'Brazil',
+        'Canada',
+        'Denmark',
+        'Finland',
+        'France',
+        'Germany',
+        'Greece',
+        'Hong Kong',
+        'Hungary',
+        'Ireland',
+        'Indonesia',
+        'Israel',
+        'Italy',
+        'Japan',
+        'Kazakhstan',
+        'Korea',
+        'Luxembourg',
+        'Malaysia',
+        'Mexico',
+        'Netherlands',
+        'New Zealand',
+        'Norway',
+        'Poland',
+        'Portugal',
+        'Russia',
+        'Saudi Arabia',
+        'Singapore',
+        'Spain',
+        'Sweden',
+        'Switzerland',
+        'Thailand',
+        'Turkey',
+        'Ukraine',
+        'United Kingdom**',
+        'United States***',
+        'Vietnam',
+        'China'
+      ],
+      categories: [
+        'Fashion (clothing and accessories)',
+        'Health (and beauty)',
+        'Toys (and baby equipment)',
+        'Media (Books and CDs)',
+        'Groceries (Food and Drink)',
+        'Technology (Phones and Computers)',
+        'Home (furniture and accessories)',
+        'Gifts (flowers, cards, etc)',
+        'Adult'
+      ],
+      relayOptions: [
+        'wss://nostr-relay.herokuapp.com/ws',
+        'wss://nostr-relay.bigsun.xyz/ws',
+        'wss://freedom-relay.herokuapp.com/ws'
+      ],
+      label: '',
+      ordersTable: {
+        columns: [
+          {
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },
+          {
+            name: 'address',
+            align: 'left',
+            label: 'Address',
+            field: 'address'
+          },
+          {
+            name: 'invoiceid',
+            align: 'left',
+            label: 'InvoiceID',
+            field: 'invoiceid'
+          },
+          {name: 'paid', align: 'left', label: 'Paid', field: 'paid'},
+          {name: 'shipped', align: 'left', label: 'Shipped', field: 'shipped'}
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      productsTable: {
+        columns: [
+          {
+            name: 'stall',
+            align: 'left',
+            label: 'Stall',
+            field: 'stall'
+          },
+          {
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'description',
+            align: 'left',
+            label: 'Description',
+            field: 'description'
+          },
+          {
+            name: 'categories',
+            align: 'left',
+            label: 'Categories',
+            field: 'categories'
+          },
+          {name: 'price', align: 'left', label: 'Price', field: 'price'},
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },
+          {name: 'id', align: 'left', label: 'ID', field: 'id'}
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      stallTable: {
+        columns: [
+          {
+            name: 'id',
+            align: 'left',
+            label: 'ID',
+            field: 'id'
+          },
+          {
+            name: 'name',
+            align: 'left',
+            label: 'Name',
+            field: 'name'
+          },
+          {
+            name: 'wallet',
+            align: 'left',
+            label: 'Wallet',
+            field: 'wallet'
+          },
+          {
+            name: 'publickey',
+            align: 'left',
+            label: 'Public key',
+            field: 'publickey'
+          },
+          {
+            name: 'privatekey',
+            align: 'left',
+            label: 'Private key',
+            field: 'privatekey'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      zonesTable: {
+        columns: [
+          {
+            name: 'id',
+            align: 'left',
+            label: 'ID',
+            field: 'id'
+          },
+          {
+            name: 'countries',
+            align: 'left',
+            label: 'Countries',
+            field: 'countries'
+          },
+          {
+            name: 'cost',
+            align: 'left',
+            label: 'Cost',
+            field: 'cost'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      productDialog: {
+        show: false,
+        data: {}
+      },
+      stallDialog: {
+        show: false,
+        data: {}
+      },
+      zoneDialog: {
+        show: false,
+        data: {countries:[]}
+      },
+      shopDialog: {
+        show: false,
+        data: {activate: false}
+      },
+      orderDialog: {
+        show: false,
+        data: {}
+      },
+      relayDialog: {
+        show: false,
+        data: {}
+      }
+    }
+  },
+  computed: {
+    categoryOther: function () {
+      cats = trim(this.productDialog.data.categories.split(','))
+      for (let i = 0; i < cats.length; i++) {
+        if (cats[i] == 'Others') {
+          return true
+        }
+      }
+      return false
+    }
+  },
+  methods: {
+    capitalizeFirstLetter: function (string) {
+      return string.charAt(0).toUpperCase() + string.slice(1);
+    },
+    errorMessage: function (error) {
+      this.$q.notify({
+        color: 'primary',
+        message: error
+      })
+    },
+    ////////////////////////////////////////
+    ///////////SUPPORT MESSAGES/////////////
+    ////////////////////////////////////////
+    getMessages: function (customerKey) {
+      var self = this
+      messages = []
+      messages.push(['in', 'blah blah'])
+      messages.push(['out', 'blah blah'])
+      self.customerMessages = messages
+    },
+    ////////////////////////////////////////
+    ////////////////STALLS//////////////////
+    ////////////////////////////////////////
+    getStalls: function () {
+      var self = this
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/stalls?all_wallets',
+          self.g.user.wallets[0].adminkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.stalls = response.data.map(mapStalls)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    openStallUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.stalls, {id: linkId})
+
+      this.stallDialog.data = _.clone(link._data)
+      this.stallDialog.show = true
+    },
+    sendStallFormData: function () {
+      if (this.stallDialog.data.id) {
+      } else {
+        var data = {
+          name: this.stallDialog.data.name,
+          wallet: this.stallDialog.data.wallet,
+          publickey: this.stallDialog.data.publickey,
+          privatekey: this.stallDialog.data.privatekey,
+          relays: this.stallDialog.data.relays
+        }
+      }
+
+      if (this.stallDialog.data.id) {
+        this.updateStall(this.stallDialog.data)
+      } else {
+        this.createStall(data)
+      }
+    },
+    updateStall: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/stalls' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.stallDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'name', 'wallet', 'publickey', 'privatekey')
+        )
+        .then(function (response) {
+          self.stalls = _.reject(self.stalls, function (obj) {
+            return obj.id == data.id
+          })
+          self.stalls.push(mapStalls(response.data))
+          self.stallDialog.show = false
+          self.stallDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createStall: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/stalls',
+          _.findWhere(self.g.user.wallets, {
+            id: self.stallDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.stalls.push(mapStalls(response.data))
+          self.stallDialog.show = false
+          self.stallDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteStall: function (stallId) {
+      var self = this
+      var stall = _.findWhere(self.stalls, {id: stallId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Stall link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/stalls/' + stallId,
+              _.findWhere(self.g.user.wallets, {id: stall.wallet}).inkey
+            )
+            .then(function (response) {
+              self.stalls = _.reject(self.stalls, function (obj) {
+                return obj.id == stallId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportStallsCSV: function () {
+      LNbits.utils.exportCSV(this.stallsTable.columns, this.stalls)
+    },
+    ////////////////////////////////////////
+    ///////////////PRODUCTS/////////////////
+    ////////////////////////////////////////
+    getProducts: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/products?all_stalls',
+          self.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.products = response.data.map(mapProducts)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    openProductUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.products, {id: linkId})
+
+      self.productDialog.data = _.clone(link._data)
+      self.productDialog.show = true
+    },
+    sendProductFormData: function () {
+      if (this.productDialog.data.id) {
+      } else {
+        var data = {
+          product: this.productDialog.data.product,
+          categories:
+            this.productDialog.data.categories +
+            this.productDialog.categoriesextra,
+          description: this.productDialog.data.description,
+          image: this.productDialog.data.image,
+          price: this.productDialog.data.price,
+          quantity: this.productDialog.data.quantity
+        }
+      }
+      if (this.productDialog.data.id) {
+        this.updateProduct(this.productDialog.data)
+      } else {
+        this.createProduct(data)
+      }
+    },
+    imageAdded(file) {
+      let blobURL = URL.createObjectURL(file)
+      let image = new Image()
+      image.src = blobURL
+      image.onload = async () => {
+        let canvas = document.createElement('canvas')
+        canvas.setAttribute('width', 100)
+        canvas.setAttribute('height', 100)
+        await pica.resize(image, canvas, {
+          quality: 0,
+          alpha: true,
+          unsharpAmount: 95,
+          unsharpRadius: 0.9,
+          unsharpThreshold: 70
+        })
+        this.productDialog.data.image = canvas.toDataURL()
+        this.productDialog = {...this.productDialog}
+      }
+    },
+    imageCleared() {
+      this.productDialog.data.image = null
+      this.productDialog = {...this.productDialog}
+    },
+    updateProduct: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/products' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.productDialog.data.wallet
+          }).inkey,
+          _.pick(
+            data,
+            'shopname',
+            'relayaddress',
+            'shippingzone1',
+            'zone1cost',
+            'shippingzone2',
+            'zone2cost',
+            'email'
+          )
+        )
+        .then(function (response) {
+          self.products = _.reject(self.products, function (obj) {
+            return obj.id == data.id
+          })
+          self.products.push(mapProducts(response.data))
+          self.productDialog.show = false
+          self.productDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createProduct: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/products',
+          _.findWhere(self.g.user.wallets, {
+            id: self.productDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.products.push(mapProducts(response.data))
+          self.productDialog.show = false
+          self.productDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteProduct: function (productId) {
+      var self = this
+      var product = _.findWhere(this.products, {id: productId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this products link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/products/' + productId,
+              _.findWhere(self.g.user.wallets, {id: product.wallet}).inkey
+            )
+            .then(function (response) {
+              self.products = _.reject(self.products, function (obj) {
+                return obj.id == productId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportProductsCSV: function () {
+      LNbits.utils.exportCSV(this.productsTable.columns, this.products)
+    },
+    ////////////////////////////////////////
+    //////////////////ZONE//////////////////
+    ////////////////////////////////////////
+    getZones: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/zones',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            console.log(response)
+            self.zones = response.data.map(mapZone)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    openZoneUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.zones, {id: linkId})
+      countriesArray = link._data.countries.split(",")
+      for (let i = 0; i < countriesArray.length; i++) {
+        countriesArray[i] = self.capitalizeFirstLetter(countriesArray[i])
+      }
+      link._data.countries = countriesArray
+      this.zoneDialog.data = _.clone(link._data)
+      this.zoneDialog.show = true
+    },
+    sendZoneFormData: function () {
+    var data = {
+          countries: String(this.zoneDialog.data.countries),
+          cost: parseInt(this.zoneDialog.data.cost)
+    }
+      if (this.zoneDialog.data.id) {
+        data.id = this.zoneDialog.data.id
+        this.updateZone(data)
+      } else {
+        this.createZone(data)
+      }
+    },
+    updateZone: function (data) {
+      console.log(data)
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/zones/' + data.id,
+          self.g.user.wallets[0].adminkey,
+          data
+        )
+        .then(function (response) {
+          console.log(response)
+          self.zones = _.reject(self.zones, function (obj) {
+            return obj.id == data.id
+          })
+          self.zones.push(mapZone(response.data))
+          self.zoneDialog.show = false
+          self.zoneDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createZone: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/zones',
+          self.g.user.wallets[0].inkey,
+          data
+        )
+        .then(function (response) {
+          self.zones.push(mapZone(response.data))
+          self.zoneDialog.show = false
+          self.zoneDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteZone: function (zoneId) {
+      var self = this
+      var zone = _.findWhere(self.zones, {id: zoneId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Zone link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/zones/' + zoneId,
+              self.g.user.wallets[0].adminkey
+            )
+            .then(function (response) {
+              self.zones = _.reject(self.zones, function (obj) {
+                return obj.id == zoneId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportZonesCSV: function () {
+      LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
+    },
+    ////////////////////////////////////////
+    //////////////////SHOP//////////////////
+    ////////////////////////////////////////
+    getShops: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/shops?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.shops = response.data.map(mapShops)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    openShopUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.shops, {id: linkId})
+
+      this.shopDialog.data = _.clone(link._data)
+      this.shopDialog.show = true
+    },
+    sendShopFormData: function () {
+      if (this.shopDialog.data.id) {
+      } else {
+        var data = {
+          countries: this.shopDialog.data.countries,
+          cost: this.shopDialog.data.cost
+        }
+      }
+
+      if (this.shopDialog.data.id) {
+        this.updateZone(this.shopDialog.data)
+      } else {
+        this.createZone(data)
+      }
+    },
+    updateShop: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/shops' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.shopDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'countries', 'cost')
+        )
+        .then(function (response) {
+          self.shops = _.reject(self.shops, function (obj) {
+            return obj.id == data.id
+          })
+          self.shops.push(mapShops(response.data))
+          self.shopDialog.show = false
+          self.shopDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createShop: function (data) {
+      var self = this
+      console.log('cuntywoo')
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/shops',
+          _.findWhere(self.g.user.wallets, {
+            id: self.shopDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.shops.push(mapShops(response.data))
+          self.shopDialog.show = false
+          self.shopDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteShop: function (shopId) {
+      var self = this
+      var shop = _.findWhere(self.shops, {id: shopId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Shop link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/shops/' + shopId,
+              _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
+            )
+            .then(function (response) {
+              self.shops = _.reject(self.shops, function (obj) {
+                return obj.id == shopId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportShopsCSV: function () {
+      LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
+    },
+    ////////////////////////////////////////
+    ////////////////ORDERS//////////////////
+    ////////////////////////////////////////
+    getOrders: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/orders?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.orders = response.data.map(mapOrders)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    createOrder: function () {
+      var data = {
+        address: this.orderDialog.data.address,
+        email: this.orderDialog.data.email,
+        quantity: this.orderDialog.data.quantity,
+        shippingzone: this.orderDialog.data.shippingzone
+      }
+      var self = this
+
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/orders',
+          _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
+            .inkey,
+          data
+        )
+        .then(function (response) {
+          self.orders.push(mapOrders(response.data))
+          self.orderDialog.show = false
+          self.orderDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteOrder: function (orderId) {
+      var self = this
+      var order = _.findWhere(self.orders, {id: orderId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this order link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/orders/' + orderId,
+              _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
+            )
+            .then(function (response) {
+              self.orders = _.reject(self.orders, function (obj) {
+                return obj.id == orderId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    shipOrder: function (order_id) {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/orders/shipped/' + order_id,
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.orders.push(mapOrders(response.data))
+        })
+    },
+    exportOrdersCSV: function () {
+      LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
+    }
+  },
+  created: function () {
+    if (this.g.user.wallets.length) {
+      this.getStalls()
+      this.getProducts()
+      this.getZones()
+      this.getOrders()
+      this.customerKeys = [
+        'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
+        'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
+      ]
+      console.log(this.products.length)
+    }
+  }
+})
+</script>
 {% endblock %}
+
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 43232841..6363dc97 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -121,36 +121,32 @@ async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = D
 
 
 @diagonalley_ext.get("/api/v1/zones")
-async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
-    wallet_ids = [wallet.wallet.id]
+async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
 
-    if all_wallets:
-        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
-
-    return ([zone.dict() for zone in await get_diagonalley_zones(wallet_ids)])
+    return await get_diagonalley_zones(wallet.wallet.user)
 
 @diagonalley_ext.post("/api/v1/zones")
-@diagonalley_ext.put("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_create(
     data: createZones, 
-    zone_id: str = Query(None),  
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
-    if zone_id:
-        zone = await get_diagonalley_zone(zone_id)
-
-        if not zone:
-            return ({"message": "Zone does not exist."})
-
-        if zone.wallet != wallet.wallet.id:
-            return ({"message": "Not your record."})
-
-        zone = await update_diagonalley_zone(zone_id, **data.dict())
-    else:
-        zone = await create_diagonalley_zone(wallet=wallet.wallet.id, data=data)
-
+    zone = await create_diagonalley_zone(user=wallet.wallet.user, data=data)
     return zone.dict()
 
+@diagonalley_ext.post("/api/v1/zones/{zone_id}")
+async def api_diagonalley_zone_update(
+    data: createZones, 
+    zone_id: str = Query(None),  
+    wallet: WalletTypeInfo = Depends(require_admin_key)
+    ):
+    zone = await get_diagonalley_zone(zone_id)
+    if not zone:
+        return ({"message": "Zone does not exist."})
+    if zone.user != wallet.wallet.user:
+        return ({"message": "Not your record."})
+    zone = await update_diagonalley_zone(zone_id, **data.dict())
+    return zone
+
 
 @diagonalley_ext.delete("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
@@ -159,7 +155,7 @@ async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(
     if not zone:
         return ({"message": "zone does not exist."})
 
-    if zone.wallet != wallet.wallet.id:
+    if zone.user != wallet.wallet.user:
         return ({"message": "Not your zone."})
 
     await delete_diagonalley_zone(zone_id)

From 80b73e7aba1b1dff80693265dadd96946b27375e Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Sun, 6 Feb 2022 22:40:51 +0000
Subject: [PATCH 010/174] small fix

---
 .../templates/diagonalley/index.html          | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 7b8f8e6a..6d6ea872 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -244,7 +244,7 @@
           label="Private Key"
         ></q-input>
         <q-select
-          :options="shippingZoneOptions"
+          :options="zoneOptions"
           filled
           dense
           multiple
@@ -262,7 +262,7 @@
         <q-input
           filled
           dense
-          v-model.trim="stallDialog.data.name"
+          v-model.trim="stallDialog.data.crelays"
           label="Custom relays (seperate by comma)"
         ></q-input>
         
@@ -270,7 +270,7 @@
           filled
           dense
           v-model.trim="stallDialog.data.nostrShops"
-          label="Stall public keys (seperate by comma)"
+          label="Nostr shop public keys (seperate by comma)"
         ></q-input>
         <div class="row q-mt-lg">
           <q-btn
@@ -301,8 +301,8 @@
     <q-card>
       <q-card-section>
       
-        <q-btn unelevated v-if="stalls.length === 1" color="primary" @click="productDialog.show = true"
-          >+ Product <q-tooltip> List a produc </q-tooltip></q-btn
+        <q-btn unelevated v-if="stalls.length > 1" color="primary" @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
@@ -310,7 +310,7 @@
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated v-if="zones.length === 1" color="primary" @click="stallDialog.show = true"
+        <q-btn unelevated v-if="zones.length > 1" color="primary" @click="openStallDialog()"
           >+ Stall
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
@@ -675,6 +675,7 @@ new Vue({
       orders: [],
       stalls: [],
       zones: [],
+      zoneOptions: [],
       customerKeys: [],
       customerKey: '',
       customerMessages: {},
@@ -949,10 +950,19 @@ new Vue({
             LNbits.utils.notifyApiError(error)
           })
     },
+    openStallDialog: function () {
+      console.log(this.zones[0]['id'])
+      for(let i = 0; i < this.zones.length; i ++){
+        this.zoneOptions.push(this.zones[i]['id'])
+      }
+      this.stallDialog.show = true
+    },
     openStallUpdateDialog: function (linkId) {
       var self = this
       var link = _.findWhere(self.stalls, {id: linkId})
-
+      for(let i = 0; i < this.zones.length; i ++){
+        this.zoneOptions.push(this.stalls[i][0])
+      }
       this.stallDialog.data = _.clone(link._data)
       this.stallDialog.show = true
     },
@@ -1210,6 +1220,7 @@ new Vue({
           if (response.data) {
             console.log(response)
             self.zones = response.data.map(mapZone)
+            
           }
         })
         .catch(function (error) {

From f38492a9209f27cf587946c0359c5ae047d9463c Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Mon, 7 Feb 2022 13:22:43 +0000
Subject: [PATCH 011/174] Added nostr ext

---
 lnbits/extensions/nostr/README.md             |   3 +
 lnbits/extensions/nostr/__init__.py           |  17 +
 lnbits/extensions/nostr/config.json           |   6 +
 lnbits/extensions/nostr/crud.py               | 134 +++++
 lnbits/extensions/nostr/migrations.py         |  47 ++
 lnbits/extensions/nostr/models.py             |  34 ++
 .../templates/lnurldevice/_api_docs.html      | 169 ++++++
 .../nostr/templates/lnurldevice/error.html    |  34 ++
 .../nostr/templates/lnurldevice/index.html    | 534 ++++++++++++++++++
 .../nostr/templates/lnurldevice/paid.html     |  27 +
 lnbits/extensions/nostr/views.py              |  24 +
 lnbits/extensions/nostr/views_api.py          |  48 ++
 12 files changed, 1077 insertions(+)
 create mode 100644 lnbits/extensions/nostr/README.md
 create mode 100644 lnbits/extensions/nostr/__init__.py
 create mode 100644 lnbits/extensions/nostr/config.json
 create mode 100644 lnbits/extensions/nostr/crud.py
 create mode 100644 lnbits/extensions/nostr/migrations.py
 create mode 100644 lnbits/extensions/nostr/models.py
 create mode 100644 lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
 create mode 100644 lnbits/extensions/nostr/templates/lnurldevice/error.html
 create mode 100644 lnbits/extensions/nostr/templates/lnurldevice/index.html
 create mode 100644 lnbits/extensions/nostr/templates/lnurldevice/paid.html
 create mode 100644 lnbits/extensions/nostr/views.py
 create mode 100644 lnbits/extensions/nostr/views_api.py

diff --git a/lnbits/extensions/nostr/README.md b/lnbits/extensions/nostr/README.md
new file mode 100644
index 00000000..596cce9d
--- /dev/null
+++ b/lnbits/extensions/nostr/README.md
@@ -0,0 +1,3 @@
+# Nostr
+
+Opens a Nostr daemon
diff --git a/lnbits/extensions/nostr/__init__.py b/lnbits/extensions/nostr/__init__.py
new file mode 100644
index 00000000..775960e3
--- /dev/null
+++ b/lnbits/extensions/nostr/__init__.py
@@ -0,0 +1,17 @@
+from fastapi import APIRouter
+
+from lnbits.db import Database
+from lnbits.helpers import template_renderer
+
+db = Database("ext_nostr")
+
+nostr_ext: APIRouter = APIRouter(prefix="/nostr", tags=["nostr"])
+
+
+def nostr_renderer():
+    return template_renderer(["lnbits/extensions/nostr/templates"])
+
+
+from .lnurl import *  # noqa
+from .views import *  # noqa
+from .views_api import *  # noqa
diff --git a/lnbits/extensions/nostr/config.json b/lnbits/extensions/nostr/config.json
new file mode 100644
index 00000000..a32e39a1
--- /dev/null
+++ b/lnbits/extensions/nostr/config.json
@@ -0,0 +1,6 @@
+{
+  "name": "Nostr",
+  "short_description": "Daemon for Nostr",
+  "icon": "swap_horizontal_circle",
+  "contributors": ["arcbtc"]
+}
diff --git a/lnbits/extensions/nostr/crud.py b/lnbits/extensions/nostr/crud.py
new file mode 100644
index 00000000..55e99ec6
--- /dev/null
+++ b/lnbits/extensions/nostr/crud.py
@@ -0,0 +1,134 @@
+from typing import List, Optional, Union
+
+from lnbits.helpers import urlsafe_short_hash
+
+from . import db
+from .models import nostrKeys, nostrNotes, nostrRelays, nostrConnections
+
+###############KEYS##################
+
+async def create_nostrkeys(
+    data: nostrKeys
+) -> nostrKeys:
+    nostrkey_id = urlsafe_short_hash()
+    await db.execute(
+        """
+        INSERT INTO nostr.keys (
+            id,
+            pubkey,
+            privkey
+        )
+        VALUES (?, ?, ?)
+        """,
+        (nostrkey_id, data.pubkey, data.privkey),
+    )
+    return await get_nostrkeys(nostrkey_id)
+
+async def get_nostrkeys(nostrkey_id: str) -> nostrKeys:
+    row = await db.fetchone(
+        "SELECT * FROM nostr.keys WHERE id = ?",
+        (lnurldevicepayment_id,),
+    )
+    return nostrKeys(**row) if row else None
+
+
+###############NOTES##################
+
+async def create_nostrnotes(
+    data: nostrNotes
+) -> nostrNotes:
+    await db.execute(
+        """
+        INSERT INTO nostr.notes (
+            id,
+            pubkey,
+            created_at,
+            kind,
+            tags,
+            content,
+            sig
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+        """,
+        (data.id, data.pubkey, data.created_at, data.kind, data.tags, data.content, data.sig),
+    )
+    return await get_nostrnotes(data.id)
+
+async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
+    row = await db.fetchone(
+        "SELECT * FROM nostr.notes WHERE id = ?",
+        (nostrnote_id,),
+    )
+    return nostrNotes(**row) if row else None
+
+###############RELAYS##################
+
+async def create_nostrrelays(
+    relay: str
+) -> nostrRelays:
+    nostrrelay_id = urlsafe_short_hash()
+    await db.execute(
+        """
+        INSERT INTO nostr.relays (
+            id,
+            relay
+        )
+        VALUES (?, ?)
+        """,
+        (nostrrelay_id, relay),
+    )
+    return await get_nostrnotes(nostrrelay_id)
+
+async def get_nostrrelays(nostrrelay_id: str) -> nostrRelays:
+    row = await db.fetchone(
+        "SELECT * FROM nostr.relays WHERE id = ?",
+        (nostrnote_id,),
+    )
+    return nostrRelays(**row) if row else None
+
+
+###############CONNECTIONS##################
+
+async def create_nostrconnections(
+    data: nostrNotes
+) -> nostrNotes:
+    nostrkey_id = urlsafe_short_hash()
+    await db.execute(
+        """
+        INSERT INTO nostr.notes (
+            id,
+            pubkey,
+            created_at,
+            kind,
+            tags,
+            content,
+            sig
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+        """,
+        (data.id, data.pubkey, data.created_at, data.kind, data.tags, data.content, data.sig),
+    )
+    return await get_nostrnotes(data.id)
+
+async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
+    row = await db.fetchone(
+        "SELECT * FROM nostr.notes WHERE id = ?",
+        (nostrnote_id,),
+    )
+    return nostrNotes(**row) if row else None
+
+
+
+async def update_lnurldevicepayment(
+    lnurldevicepayment_id: str, **kwargs
+) -> Optional[lnurldevicepayment]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+    await db.execute(
+        f"UPDATE lnurldevice.lnurldevicepayment SET {q} WHERE id = ?",
+        (*kwargs.values(), lnurldevicepayment_id),
+    )
+    row = await db.fetchone(
+        "SELECT * FROM lnurldevice.lnurldevicepayment WHERE id = ?",
+        (lnurldevicepayment_id,),
+    )
+    return lnurldevicepayment(**row) if row else None
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/migrations.py b/lnbits/extensions/nostr/migrations.py
new file mode 100644
index 00000000..de32a578
--- /dev/null
+++ b/lnbits/extensions/nostr/migrations.py
@@ -0,0 +1,47 @@
+from lnbits.db import Database
+
+db2 = Database("ext_nostr")
+
+
+async def m001_initial(db):
+    """
+    Initial nostr table.
+    """
+    await db.execute(
+        f"""
+        CREATE TABLE nostr.keys (
+            pubkey TEXT NOT NULL PRIMARY KEY,
+            privkey TEXT NOT NULL
+        );
+    """
+    )
+    await db.execute(
+        f"""
+        CREATE TABLE nostr.notes (
+            id TEXT NOT NULL PRIMARY KEY,
+            pubkey TEXT NOT NULL,
+            created_at TEXT NOT NULL,
+            kind INT NOT NULL,
+            tags TEXT NOT NULL,
+            content TEXT NOT NULL,
+            sig TEXT NOT NULL,
+        );
+    """
+    )
+    await db.execute(
+        f"""
+        CREATE TABLE nostr.relays (
+            id TEXT NOT NULL PRIMARY KEY,
+            relay TEXT NOT NULL
+        );
+    """
+    )
+    await db.execute(
+        f"""
+        CREATE TABLE nostr.connections (
+            id TEXT NOT NULL PRIMARY KEY,
+            publickey TEXT NOT NULL,
+            relayid TEXT NOT NULL
+        );
+    """
+    )
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/models.py b/lnbits/extensions/nostr/models.py
new file mode 100644
index 00000000..ba0c87a5
--- /dev/null
+++ b/lnbits/extensions/nostr/models.py
@@ -0,0 +1,34 @@
+import json
+from sqlite3 import Row
+from typing import Optional
+
+from fastapi import Request
+from lnurl import Lnurl
+from lnurl import encode as lnurl_encode  # type: ignore
+from lnurl.models import LnurlPaySuccessAction, UrlAction  # type: ignore
+from lnurl.types import LnurlPayMetadata  # type: ignore
+from pydantic import BaseModel
+from pydantic.main import BaseModel
+
+class nostrKeys(BaseModel):
+    id: str
+    pubkey: str
+    privkey: str
+
+class nostrNotes(BaseModel):
+    id: str
+    pubkey: str
+    created_at: str
+    kind: int
+    tags: str
+    content: str
+    sig: str
+
+class nostrRelays(BaseModel):
+    id: str
+    relay: str
+
+class nostrConnections(BaseModel):
+    id: str
+    pubkey: str
+    relayid: str
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html b/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
new file mode 100644
index 00000000..af69b76e
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
@@ -0,0 +1,169 @@
+<q-card>
+  <q-card-section>
+    <p>
+      Register LNURLDevice devices to receive payments in your LNbits wallet.<br />
+      Build your own here
+      <a href="https://github.com/arcbtc/bitcoinpos"
+        >https://github.com/arcbtc/bitcoinpos</a
+      ><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 lnurldevice"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue"></span> /lnurldevice/api/v1/lnurlpos</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;lnurldevice_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X POST {{ request.base_url }}api/v1/lnurldevice -d '{"title":
+            &lt;string&gt;, "message":&lt;string&gt;, "currency":
+            &lt;integer&gt;}' -H "Content-type: application/json" -H "X-Api-Key:
+            {{user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-expansion-item
+      group="api"
+      dense
+      expand-separator
+      label="Update lnurldevice"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">PUT</span>
+            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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;lnurldevice_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X POST {{ request.base_url
+            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -d ''{"title":
+            &lt;string&gt;, "message":&lt;string&gt;, "currency":
+            &lt;integer&gt;} -H "Content-type: application/json" -H "X-Api-Key:
+            {{user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+
+    <q-expansion-item
+      group="api"
+      dense
+      expand-separator
+      label="Get lnurldevice"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span>
+            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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;lnurldevice_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.base_url
+            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -H "X-Api-Key: {{
+            user.wallets[0].inkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-expansion-item
+      group="api"
+      dense
+      expand-separator
+      label="Get lnurldevices"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span>
+            /lnurldevice/api/v1/lnurlposs</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;lnurldevice_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.base_url }}api/v1/lnurldevices -H
+            "X-Api-Key: {{ 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>
+            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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.base_url
+            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -H "X-Api-Key: {{
+            user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+  </q-expansion-item>
+</q-card>
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/error.html b/lnbits/extensions/nostr/templates/lnurldevice/error.html
new file mode 100644
index 00000000..d8e41832
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/lnurldevice/error.html
@@ -0,0 +1,34 @@
+{% extends "public.html" %} {% block page %}
+<div class="row q-col-gutter-md justify-center">
+  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
+    <q-card class="q-pa-lg">
+      <q-card-section class="q-pa-none">
+        <center>
+          <h3 class="q-my-none">LNURL-pay not paid</h3>
+          <br />
+          <q-icon
+            name="warning"
+            class="text-grey"
+            style="font-size: 20rem"
+          ></q-icon>
+
+          <br />
+        </center>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  {% endblock %} {% block scripts %}
+
+  <script>
+    new Vue({
+      el: '#vue',
+      mixins: [windowMixin],
+      data: function () {
+        return {}
+      }
+    })
+  </script>
+
+  {% endblock %}
+</div>
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/index.html b/lnbits/extensions/nostr/templates/lnurldevice/index.html
new file mode 100644
index 00000000..b51e2556
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/lnurldevice/index.html
@@ -0,0 +1,534 @@
+{% 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="formDialoglnurldevice.show = true"
+          >New LNURLDevice 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">lNURLdevice</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="exportlnurldeviceCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          flat
+          dense
+          :data="lnurldeviceLinks"
+          row-key="id"
+          :columns="lnurldevicesTable.columns"
+          :pagination.sync="lnurldevicesTable.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
+                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>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deletelnurldeviceLink(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                >
+                  <q-tooltip> Delete LNURLDevice </q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openlnurldeviceSettings(props.row.id)"
+                  icon="perm_data_setting"
+                  color="primary"
+                >
+                  <q-tooltip> LNURLDevice Settings </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">
+          {{SITE_TITLE}} LNURLDevice Extension
+        </h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none">
+        <q-separator></q-separator>
+        <q-list> {% include "lnurldevice/_api_docs.html" %} </q-list>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  <q-dialog
+    v-model="settingsDialog.show"
+    deviceition="top"
+    @hide="closeFormDialog"
+  >
+    <q-card
+      style="width: 700px; max-width: 80vw"
+      class="q-pa-lg q-pt-xl lnbits__dialog-card"
+    >
+      <div class="text-h6">LNURLDevice device string</div>
+      <q-btn
+        dense
+        outline
+        unelevated
+        color="primary"
+        size="md"
+        @click="copyText(location + '/lnurldevice/api/v1/lnurl/' + settingsDialog.data.id + ',' +
+      settingsDialog.data.key + ',' + settingsDialog.data.currency, 'Link copied to clipboard!')"
+        >{% raw
+        %}{{location}}/lnurldevice/api/v1/lnurl/{{settingsDialog.data.id}},
+        {{settingsDialog.data.key}}, {{settingsDialog.data.currency}}{% endraw
+        %}<q-tooltip> Click to copy URL </q-tooltip>
+      </q-btn>
+
+      <div class="text-subtitle2">
+        <small> </small>
+      </div>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog
+    v-model="formDialoglnurldevice.show"
+    deviceition="top"
+    @hide="closeFormDialog"
+  >
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-form @submit="sendFormDatalnurldevice" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="formDialoglnurldevice.data.title"
+          type="text"
+          label="Title"
+        ></q-input>
+
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="formDialoglnurldevice.data.wallet"
+          :options="g.user.walletOptions"
+          label="Wallet *"
+        ></q-select>
+
+        <q-select
+          filled
+          dense
+          v-model.trim="formDialoglnurldevice.data.currency"
+          type="text"
+          label="Fiat currency for device"
+          :options="currency"
+        ></q-select>
+        <q-option-group
+          v-model.trim="formDialoglnurldevice.data.device"
+          :options="devices"
+          color="primary"
+          label="Type of device"
+        ></q-option-group>
+        <q-input
+          filled
+          dense
+          v-model.trim="formDialoglnurldevice.data.profit"
+          type="number"
+          max="90"
+          label="Profit margin (% added to invoices/deducted from faucets)"
+        ></q-input>
+
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="formDialoglnurldevice.data.id"
+            unelevated
+            color="primary"
+            :disable="
+                formDialoglnurldevice.data.title == ''"
+            type="submit"
+            >Update lnurldevice</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="
+                formDialoglnurldevice.data.title == ''"
+            type="submit"
+            >Create lnurldevice</q-btn
+          >
+          <q-btn @click="cancellnurldevice" 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>
+  Vue.component(VueQrcode.name, VueQrcode)
+
+  var maplnurldevice = 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'
+      )
+    }
+    return obj
+  }
+
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        location: window.location.hostname,
+        filter: '',
+        currency: 'USD',
+        lnurldeviceLinks: [],
+        lnurldeviceLinksObj: [],
+        devices: [
+          {
+            label: 'PoS',
+            value: 'pos'
+          },
+          {
+            label: 'ATM',
+            value: 'atm'
+          }
+        ],
+        lnurldevicesTable: {
+          columns: [
+            {
+              name: 'title',
+              align: 'left',
+              label: 'title',
+              field: 'title'
+            },
+            {
+              name: 'theId',
+              align: 'left',
+              label: 'id',
+              field: 'id'
+            },
+            {
+              name: 'key',
+              align: 'left',
+              label: 'key',
+              field: 'key'
+            },
+            {
+              name: 'wallet',
+              align: 'left',
+              label: 'wallet',
+              field: 'wallet'
+            },
+            {
+              name: 'device',
+              align: 'left',
+              label: 'device',
+              field: 'device'
+            },
+            {
+              name: 'profit',
+              align: 'left',
+              label: 'profit',
+              field: 'profit'
+            },
+            {
+              name: 'currency',
+              align: 'left',
+              label: 'currency',
+              field: 'currency'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        },
+        passedlnurldevice: {},
+        settingsDialog: {
+          show: false,
+          data: {}
+        },
+        formDialog: {
+          show: false,
+          data: {}
+        },
+        formDialoglnurldevice: {
+          show: false,
+          data: {
+            lnurl_toggle: false,
+            show_message: false,
+            show_ack: false,
+            show_price: 'None',
+            device: 'pos',
+            profit: 2,
+            title: ''
+          }
+        },
+        qrCodeDialog: {
+          show: false,
+          data: null
+        }
+      }
+    },
+    methods: {
+      cancellnurldevice: function (data) {
+        var self = this
+        self.formDialoglnurldevice.show = false
+        self.clearFormDialoglnurldevice()
+      },
+      closeFormDialog: function () {
+        this.clearFormDialoglnurldevice()
+        this.formDialog.data = {
+          is_unique: false
+        }
+      },
+      sendFormDatalnurldevice: function () {
+        var self = this
+        if (self.formDialoglnurldevice.data.id) {
+          this.updatelnurldevice(
+            self.g.user.wallets[0].adminkey,
+            self.formDialoglnurldevice.data
+          )
+        } else {
+          this.createlnurldevice(
+            self.g.user.wallets[0].adminkey,
+            self.formDialoglnurldevice.data
+          )
+        }
+      },
+
+      createlnurldevice: function (wallet, data) {
+        var self = this
+        var updatedData = {}
+        for (const property in data) {
+          if (data[property]) {
+            updatedData[property] = data[property]
+          }
+        }
+        LNbits.api
+          .request('POST', '/lnurldevice/api/v1/lnurlpos', wallet, updatedData)
+          .then(function (response) {
+            self.lnurldeviceLinks.push(maplnurldevice(response.data))
+            self.formDialoglnurldevice.show = false
+            self.clearFormDialoglnurldevice()
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getlnurldevices: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/lnurldevice/api/v1/lnurlpos',
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.lnurldeviceLinks = response.data.map(maplnurldevice)
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getlnurldevice: function (lnurldevice_id) {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/lnurldevice/api/v1/lnurlpos/' + lnurldevice_id,
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            localStorage.setItem('lnurldevice', JSON.stringify(response.data))
+            localStorage.setItem('inkey', self.g.user.wallets[0].inkey)
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      deletelnurldeviceLink: function (lnurldeviceId) {
+        var self = this
+        var link = _.findWhere(this.lnurldeviceLinks, {id: lnurldeviceId})
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this pay link?')
+          .onOk(function () {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/lnurldevice/api/v1/lnurlpos/' + lnurldeviceId,
+                self.g.user.wallets[0].adminkey
+              )
+              .then(function (response) {
+                self.lnurldeviceLinks = _.reject(
+                  self.lnurldeviceLinks,
+                  function (obj) {
+                    return obj.id === lnurldeviceId
+                  }
+                )
+              })
+              .catch(function (error) {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      openUpdatelnurldeviceLink: function (lnurldeviceId) {
+        var self = this
+        var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
+          id: lnurldeviceId
+        })
+        self.formDialoglnurldevice.data = _.clone(lnurldevice._data)
+        self.formDialoglnurldevice.show = true
+      },
+      openlnurldeviceSettings: function (lnurldeviceId) {
+        var self = this
+        var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
+          id: lnurldeviceId
+        })
+        self.settingsDialog.data = _.clone(lnurldevice._data)
+        self.settingsDialog.show = true
+      },
+      updatelnurldevice: function (wallet, data) {
+        var self = this
+        var updatedData = {}
+        for (const property in data) {
+          if (data[property]) {
+            updatedData[property] = data[property]
+          }
+        }
+
+        LNbits.api
+          .request(
+            'PUT',
+            '/lnurldevice/api/v1/lnurlpos/' + updatedData.id,
+            wallet,
+            updatedData
+          )
+          .then(function (response) {
+            self.lnurldeviceLinks = _.reject(
+              self.lnurldeviceLinks,
+              function (obj) {
+                return obj.id === updatedData.id
+              }
+            )
+            self.lnurldeviceLinks.push(maplnurldevice(response.data))
+            self.formDialoglnurldevice.show = false
+            self.clearFormDialoglnurldevice()
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      clearFormDialoglnurldevice() {
+        this.formDialoglnurldevice.data = {
+          lnurl_toggle: false,
+          show_message: false,
+          show_ack: false,
+          show_price: 'None',
+          title: ''
+        }
+      },
+      exportlnurldeviceCSV: function () {
+        var self = this
+        LNbits.utils.exportCSV(
+          self.lnurldevicesTable.columns,
+          this.lnurldeviceLinks
+        )
+      }
+    },
+    created: function () {
+      var self = this
+      var getlnurldevices = this.getlnurldevices
+      getlnurldevices()
+      self.location = [
+        window.location.protocol,
+        '//',
+        window.location.host
+      ].join('')
+      LNbits.api
+        .request('GET', '/api/v1/currencies')
+        .then(response => {
+          this.currency = ['USD', ...response.data]
+        })
+        .catch(err => {
+          LNbits.utils.notifyApiError(err)
+        })
+    }
+  })
+</script>
+{% endblock %}
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/paid.html b/lnbits/extensions/nostr/templates/lnurldevice/paid.html
new file mode 100644
index 00000000..c185ecce
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/lnurldevice/paid.html
@@ -0,0 +1,27 @@
+{% extends "public.html" %} {% block page %}
+<div class="row q-col-gutter-md justify-center">
+  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
+    <q-card class="q-pa-lg">
+      <q-card-section class="q-pa-none">
+        <center>
+          <h3 class="q-my-none">{{ pin }}</h3>
+          <br />
+        </center>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  {% endblock %} {% block scripts %}
+
+  <script>
+    new Vue({
+      el: '#vue',
+      mixins: [windowMixin],
+      data: function () {
+        return {}
+      }
+    })
+  </script>
+
+  {% endblock %}
+</div>
diff --git a/lnbits/extensions/nostr/views.py b/lnbits/extensions/nostr/views.py
new file mode 100644
index 00000000..1dfc07da
--- /dev/null
+++ b/lnbits/extensions/nostr/views.py
@@ -0,0 +1,24 @@
+from http import HTTPStatus
+
+from fastapi import Request
+from fastapi.param_functions import Query
+from fastapi.params import Depends
+from fastapi.templating import Jinja2Templates
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+
+from lnbits.core.crud import update_payment_status
+from lnbits.core.models import User
+from lnbits.core.views.api import api_payment
+from lnbits.decorators import check_user_exists
+
+from . import nostr_ext, nostr_renderer
+
+templates = Jinja2Templates(directory="templates")
+
+
+@nostr_ext.get("/", response_class=HTMLResponse)
+async def index(request: Request, user: User = Depends(check_user_exists)):
+    return nostr_renderer().TemplateResponse(
+        "nostr/index.html", {"request": request, "user": user.dict()}
+    )
diff --git a/lnbits/extensions/nostr/views_api.py b/lnbits/extensions/nostr/views_api.py
new file mode 100644
index 00000000..a479cad8
--- /dev/null
+++ b/lnbits/extensions/nostr/views_api.py
@@ -0,0 +1,48 @@
+from http import HTTPStatus
+
+from fastapi import Request
+from fastapi.param_functions import Query
+from fastapi.params import Depends
+from starlette.exceptions import HTTPException
+
+from lnbits.core.crud import get_user
+from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
+from lnbits.extensions.lnurldevice import lnurldevice_ext
+from lnbits.utils.exchange_rates import currencies
+
+from . import lnurldevice_ext
+from .crud import (
+    create_lnurldevice,
+    delete_lnurldevice,
+    get_lnurldevice,
+    get_lnurldevices,
+    update_lnurldevice,
+)
+from .models import createLnurldevice
+
+
+@nostr_ext.get("/api/v1/lnurlpos")
+async def api_check_daemon(wallet: WalletTypeInfo = Depends(get_key_type)):
+    wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+    try:
+        return [
+            {**lnurldevice.dict()} for lnurldevice in await get_lnurldevices(wallet_ids)
+        ]
+    except:
+        return ""
+
+@nostr_ext.delete("/api/v1/lnurlpos/{lnurldevice_id}")
+async def api_lnurldevice_delete(
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+    lnurldevice_id: str = Query(None),
+):
+    lnurldevice = await get_lnurldevice(lnurldevice_id)
+
+    if not lnurldevice:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Wallet link does not exist."
+        )
+
+    await delete_lnurldevice(lnurldevice_id)
+
+    return "", HTTPStatus.NO_CONTENT
\ No newline at end of file

From da1025a625b75dc842efb2baf7582cfb5682a191 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Mon, 7 Feb 2022 20:01:01 +0000
Subject: [PATCH 012/174] extension loading

---
 lnbits/extensions/nostr/__init__.py           |   2 -
 lnbits/extensions/nostr/crud.py               |  71 +--
 lnbits/extensions/nostr/migrations.py         |   2 +-
 lnbits/extensions/nostr/models.py             |  12 +-
 .../templates/lnurldevice/_api_docs.html      | 169 ------
 .../nostr/templates/lnurldevice/error.html    |  34 --
 .../nostr/templates/lnurldevice/index.html    | 534 ------------------
 .../nostr/templates/lnurldevice/paid.html     |  27 -
 .../nostr/templates/nostr/index.html          | 159 ++++++
 lnbits/extensions/nostr/views_api.py          |  46 +-
 10 files changed, 204 insertions(+), 852 deletions(-)
 delete mode 100644 lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
 delete mode 100644 lnbits/extensions/nostr/templates/lnurldevice/error.html
 delete mode 100644 lnbits/extensions/nostr/templates/lnurldevice/index.html
 delete mode 100644 lnbits/extensions/nostr/templates/lnurldevice/paid.html
 create mode 100644 lnbits/extensions/nostr/templates/nostr/index.html

diff --git a/lnbits/extensions/nostr/__init__.py b/lnbits/extensions/nostr/__init__.py
index 775960e3..9774a279 100644
--- a/lnbits/extensions/nostr/__init__.py
+++ b/lnbits/extensions/nostr/__init__.py
@@ -11,7 +11,5 @@ nostr_ext: APIRouter = APIRouter(prefix="/nostr", tags=["nostr"])
 def nostr_renderer():
     return template_renderer(["lnbits/extensions/nostr/templates"])
 
-
-from .lnurl import *  # noqa
 from .views import *  # noqa
 from .views_api import *  # noqa
diff --git a/lnbits/extensions/nostr/crud.py b/lnbits/extensions/nostr/crud.py
index 55e99ec6..0b30bc9a 100644
--- a/lnbits/extensions/nostr/crud.py
+++ b/lnbits/extensions/nostr/crud.py
@@ -1,33 +1,31 @@
 from typing import List, Optional, Union
 
 from lnbits.helpers import urlsafe_short_hash
-
+import shortuuid
 from . import db
-from .models import nostrKeys, nostrNotes, nostrRelays, nostrConnections
+from .models import nostrKeys, nostrNotes, nostrCreateRelays, nostrRelays, nostrConnections, nostrCreateConnections
 
 ###############KEYS##################
 
 async def create_nostrkeys(
     data: nostrKeys
 ) -> nostrKeys:
-    nostrkey_id = urlsafe_short_hash()
     await db.execute(
         """
         INSERT INTO nostr.keys (
-            id,
             pubkey,
             privkey
         )
-        VALUES (?, ?, ?)
+        VALUES (?, ?)
         """,
-        (nostrkey_id, data.pubkey, data.privkey),
+        (data.pubkey, data.privkey),
     )
     return await get_nostrkeys(nostrkey_id)
 
-async def get_nostrkeys(nostrkey_id: str) -> nostrKeys:
+async def get_nostrkeys(pubkey: str) -> nostrKeys:
     row = await db.fetchone(
-        "SELECT * FROM nostr.keys WHERE id = ?",
-        (lnurldevicepayment_id,),
+        "SELECT * FROM nostr.keys WHERE pubkey = ?",
+        (pubkey,),
     )
     return nostrKeys(**row) if row else None
 
@@ -64,9 +62,12 @@ async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
 ###############RELAYS##################
 
 async def create_nostrrelays(
-    relay: str
-) -> nostrRelays:
-    nostrrelay_id = urlsafe_short_hash()
+    data: nostrCreateRelays
+) -> nostrCreateRelays:
+    nostrrelay_id = shortuuid.uuid(name=relay)
+    
+    if await get_nostrrelays(nostrrelay_id):
+        return "error"
     await db.execute(
         """
         INSERT INTO nostr.relays (
@@ -75,7 +76,7 @@ async def create_nostrrelays(
         )
         VALUES (?, ?)
         """,
-        (nostrrelay_id, relay),
+        (nostrrelay_id, data.relay),
     )
     return await get_nostrnotes(nostrrelay_id)
 
@@ -90,45 +91,25 @@ async def get_nostrrelays(nostrrelay_id: str) -> nostrRelays:
 ###############CONNECTIONS##################
 
 async def create_nostrconnections(
-    data: nostrNotes
-) -> nostrNotes:
-    nostrkey_id = urlsafe_short_hash()
+    data: nostrCreateConnections
+) -> nostrCreateConnections:
+    nostrrelay_id = shortuuid.uuid(name=data.relayid + data.pubkey)
     await db.execute(
         """
-        INSERT INTO nostr.notes (
+        INSERT INTO nostr.connections (
             id,
             pubkey,
-            created_at,
-            kind,
-            tags,
-            content,
-            sig
+            relayid
         )
-        VALUES (?, ?, ?, ?, ?, ?, ?)
+        VALUES (?, ?, ?)
         """,
-        (data.id, data.pubkey, data.created_at, data.kind, data.tags, data.content, data.sig),
+        (data.id, data.pubkey, data.relayid),
     )
-    return await get_nostrnotes(data.id)
+    return await get_nostrconnections(data.id)
 
-async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
+async def get_nostrconnections(nostrconnections_id: str) -> nostrConnections:
     row = await db.fetchone(
-        "SELECT * FROM nostr.notes WHERE id = ?",
-        (nostrnote_id,),
+        "SELECT * FROM nostr.connections WHERE id = ?",
+        (nostrconnections_id,),
     )
-    return nostrNotes(**row) if row else None
-
-
-
-async def update_lnurldevicepayment(
-    lnurldevicepayment_id: str, **kwargs
-) -> Optional[lnurldevicepayment]:
-    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(
-        f"UPDATE lnurldevice.lnurldevicepayment SET {q} WHERE id = ?",
-        (*kwargs.values(), lnurldevicepayment_id),
-    )
-    row = await db.fetchone(
-        "SELECT * FROM lnurldevice.lnurldevicepayment WHERE id = ?",
-        (lnurldevicepayment_id,),
-    )
-    return lnurldevicepayment(**row) if row else None
\ No newline at end of file
+    return nostrConnections(**row) if row else None
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/migrations.py b/lnbits/extensions/nostr/migrations.py
index de32a578..0c616110 100644
--- a/lnbits/extensions/nostr/migrations.py
+++ b/lnbits/extensions/nostr/migrations.py
@@ -24,7 +24,7 @@ async def m001_initial(db):
             kind INT NOT NULL,
             tags TEXT NOT NULL,
             content TEXT NOT NULL,
-            sig TEXT NOT NULL,
+            sig TEXT NOT NULL
         );
     """
     )
diff --git a/lnbits/extensions/nostr/models.py b/lnbits/extensions/nostr/models.py
index ba0c87a5..e21e5d76 100644
--- a/lnbits/extensions/nostr/models.py
+++ b/lnbits/extensions/nostr/models.py
@@ -3,15 +3,10 @@ from sqlite3 import Row
 from typing import Optional
 
 from fastapi import Request
-from lnurl import Lnurl
-from lnurl import encode as lnurl_encode  # type: ignore
-from lnurl.models import LnurlPaySuccessAction, UrlAction  # type: ignore
-from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
 from pydantic.main import BaseModel
 
 class nostrKeys(BaseModel):
-    id: str
     pubkey: str
     privkey: str
 
@@ -24,6 +19,13 @@ class nostrNotes(BaseModel):
     content: str
     sig: str
 
+class nostrCreateRelays(BaseModel):
+    relay: str
+
+class nostrCreateConnections(BaseModel):
+    pubkey: str
+    relayid: str
+
 class nostrRelays(BaseModel):
     id: str
     relay: str
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html b/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
deleted file mode 100644
index af69b76e..00000000
--- a/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<q-card>
-  <q-card-section>
-    <p>
-      Register LNURLDevice devices to receive payments in your LNbits wallet.<br />
-      Build your own here
-      <a href="https://github.com/arcbtc/bitcoinpos"
-        >https://github.com/arcbtc/bitcoinpos</a
-      ><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 lnurldevice"
-    >
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue"></span> /lnurldevice/api/v1/lnurlpos</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;lnurldevice_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X POST {{ request.base_url }}api/v1/lnurldevice -d '{"title":
-            &lt;string&gt;, "message":&lt;string&gt;, "currency":
-            &lt;integer&gt;}' -H "Content-type: application/json" -H "X-Api-Key:
-            {{user.wallets[0].adminkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-    <q-expansion-item
-      group="api"
-      dense
-      expand-separator
-      label="Update lnurldevice"
-    >
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue">PUT</span>
-            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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;lnurldevice_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X POST {{ request.base_url
-            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -d ''{"title":
-            &lt;string&gt;, "message":&lt;string&gt;, "currency":
-            &lt;integer&gt;} -H "Content-type: application/json" -H "X-Api-Key:
-            {{user.wallets[0].adminkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-
-    <q-expansion-item
-      group="api"
-      dense
-      expand-separator
-      label="Get lnurldevice"
-    >
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue">GET</span>
-            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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;lnurldevice_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X GET {{ request.base_url
-            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -H "X-Api-Key: {{
-            user.wallets[0].inkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-    <q-expansion-item
-      group="api"
-      dense
-      expand-separator
-      label="Get lnurldevices"
-    >
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue">GET</span>
-            /lnurldevice/api/v1/lnurlposs</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;lnurldevice_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X GET {{ request.base_url }}api/v1/lnurldevices -H
-            "X-Api-Key: {{ 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>
-            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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.base_url
-            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -H "X-Api-Key: {{
-            user.wallets[0].adminkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-  </q-expansion-item>
-</q-card>
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/error.html b/lnbits/extensions/nostr/templates/lnurldevice/error.html
deleted file mode 100644
index d8e41832..00000000
--- a/lnbits/extensions/nostr/templates/lnurldevice/error.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "public.html" %} {% block page %}
-<div class="row q-col-gutter-md justify-center">
-  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
-    <q-card class="q-pa-lg">
-      <q-card-section class="q-pa-none">
-        <center>
-          <h3 class="q-my-none">LNURL-pay not paid</h3>
-          <br />
-          <q-icon
-            name="warning"
-            class="text-grey"
-            style="font-size: 20rem"
-          ></q-icon>
-
-          <br />
-        </center>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  {% endblock %} {% block scripts %}
-
-  <script>
-    new Vue({
-      el: '#vue',
-      mixins: [windowMixin],
-      data: function () {
-        return {}
-      }
-    })
-  </script>
-
-  {% endblock %}
-</div>
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/index.html b/lnbits/extensions/nostr/templates/lnurldevice/index.html
deleted file mode 100644
index b51e2556..00000000
--- a/lnbits/extensions/nostr/templates/lnurldevice/index.html
+++ /dev/null
@@ -1,534 +0,0 @@
-{% 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="formDialoglnurldevice.show = true"
-          >New LNURLDevice 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">lNURLdevice</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="exportlnurldeviceCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          flat
-          dense
-          :data="lnurldeviceLinks"
-          row-key="id"
-          :columns="lnurldevicesTable.columns"
-          :pagination.sync="lnurldevicesTable.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
-                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>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deletelnurldeviceLink(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                >
-                  <q-tooltip> Delete LNURLDevice </q-tooltip>
-                </q-btn>
-              </q-td>
-              <q-td>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="openlnurldeviceSettings(props.row.id)"
-                  icon="perm_data_setting"
-                  color="primary"
-                >
-                  <q-tooltip> LNURLDevice Settings </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">
-          {{SITE_TITLE}} LNURLDevice Extension
-        </h6>
-      </q-card-section>
-      <q-card-section class="q-pa-none">
-        <q-separator></q-separator>
-        <q-list> {% include "lnurldevice/_api_docs.html" %} </q-list>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  <q-dialog
-    v-model="settingsDialog.show"
-    deviceition="top"
-    @hide="closeFormDialog"
-  >
-    <q-card
-      style="width: 700px; max-width: 80vw"
-      class="q-pa-lg q-pt-xl lnbits__dialog-card"
-    >
-      <div class="text-h6">LNURLDevice device string</div>
-      <q-btn
-        dense
-        outline
-        unelevated
-        color="primary"
-        size="md"
-        @click="copyText(location + '/lnurldevice/api/v1/lnurl/' + settingsDialog.data.id + ',' +
-      settingsDialog.data.key + ',' + settingsDialog.data.currency, 'Link copied to clipboard!')"
-        >{% raw
-        %}{{location}}/lnurldevice/api/v1/lnurl/{{settingsDialog.data.id}},
-        {{settingsDialog.data.key}}, {{settingsDialog.data.currency}}{% endraw
-        %}<q-tooltip> Click to copy URL </q-tooltip>
-      </q-btn>
-
-      <div class="text-subtitle2">
-        <small> </small>
-      </div>
-    </q-card>
-  </q-dialog>
-
-  <q-dialog
-    v-model="formDialoglnurldevice.show"
-    deviceition="top"
-    @hide="closeFormDialog"
-  >
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="sendFormDatalnurldevice" class="q-gutter-md">
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialoglnurldevice.data.title"
-          type="text"
-          label="Title"
-        ></q-input>
-
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialoglnurldevice.data.wallet"
-          :options="g.user.walletOptions"
-          label="Wallet *"
-        ></q-select>
-
-        <q-select
-          filled
-          dense
-          v-model.trim="formDialoglnurldevice.data.currency"
-          type="text"
-          label="Fiat currency for device"
-          :options="currency"
-        ></q-select>
-        <q-option-group
-          v-model.trim="formDialoglnurldevice.data.device"
-          :options="devices"
-          color="primary"
-          label="Type of device"
-        ></q-option-group>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialoglnurldevice.data.profit"
-          type="number"
-          max="90"
-          label="Profit margin (% added to invoices/deducted from faucets)"
-        ></q-input>
-
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="formDialoglnurldevice.data.id"
-            unelevated
-            color="primary"
-            :disable="
-                formDialoglnurldevice.data.title == ''"
-            type="submit"
-            >Update lnurldevice</q-btn
-          >
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="
-                formDialoglnurldevice.data.title == ''"
-            type="submit"
-            >Create lnurldevice</q-btn
-          >
-          <q-btn @click="cancellnurldevice" 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>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  var maplnurldevice = 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'
-      )
-    }
-    return obj
-  }
-
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        location: window.location.hostname,
-        filter: '',
-        currency: 'USD',
-        lnurldeviceLinks: [],
-        lnurldeviceLinksObj: [],
-        devices: [
-          {
-            label: 'PoS',
-            value: 'pos'
-          },
-          {
-            label: 'ATM',
-            value: 'atm'
-          }
-        ],
-        lnurldevicesTable: {
-          columns: [
-            {
-              name: 'title',
-              align: 'left',
-              label: 'title',
-              field: 'title'
-            },
-            {
-              name: 'theId',
-              align: 'left',
-              label: 'id',
-              field: 'id'
-            },
-            {
-              name: 'key',
-              align: 'left',
-              label: 'key',
-              field: 'key'
-            },
-            {
-              name: 'wallet',
-              align: 'left',
-              label: 'wallet',
-              field: 'wallet'
-            },
-            {
-              name: 'device',
-              align: 'left',
-              label: 'device',
-              field: 'device'
-            },
-            {
-              name: 'profit',
-              align: 'left',
-              label: 'profit',
-              field: 'profit'
-            },
-            {
-              name: 'currency',
-              align: 'left',
-              label: 'currency',
-              field: 'currency'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        passedlnurldevice: {},
-        settingsDialog: {
-          show: false,
-          data: {}
-        },
-        formDialog: {
-          show: false,
-          data: {}
-        },
-        formDialoglnurldevice: {
-          show: false,
-          data: {
-            lnurl_toggle: false,
-            show_message: false,
-            show_ack: false,
-            show_price: 'None',
-            device: 'pos',
-            profit: 2,
-            title: ''
-          }
-        },
-        qrCodeDialog: {
-          show: false,
-          data: null
-        }
-      }
-    },
-    methods: {
-      cancellnurldevice: function (data) {
-        var self = this
-        self.formDialoglnurldevice.show = false
-        self.clearFormDialoglnurldevice()
-      },
-      closeFormDialog: function () {
-        this.clearFormDialoglnurldevice()
-        this.formDialog.data = {
-          is_unique: false
-        }
-      },
-      sendFormDatalnurldevice: function () {
-        var self = this
-        if (self.formDialoglnurldevice.data.id) {
-          this.updatelnurldevice(
-            self.g.user.wallets[0].adminkey,
-            self.formDialoglnurldevice.data
-          )
-        } else {
-          this.createlnurldevice(
-            self.g.user.wallets[0].adminkey,
-            self.formDialoglnurldevice.data
-          )
-        }
-      },
-
-      createlnurldevice: function (wallet, data) {
-        var self = this
-        var updatedData = {}
-        for (const property in data) {
-          if (data[property]) {
-            updatedData[property] = data[property]
-          }
-        }
-        LNbits.api
-          .request('POST', '/lnurldevice/api/v1/lnurlpos', wallet, updatedData)
-          .then(function (response) {
-            self.lnurldeviceLinks.push(maplnurldevice(response.data))
-            self.formDialoglnurldevice.show = false
-            self.clearFormDialoglnurldevice()
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getlnurldevices: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/lnurldevice/api/v1/lnurlpos',
-            self.g.user.wallets[0].adminkey
-          )
-          .then(function (response) {
-            if (response.data) {
-              self.lnurldeviceLinks = response.data.map(maplnurldevice)
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getlnurldevice: function (lnurldevice_id) {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/lnurldevice/api/v1/lnurlpos/' + lnurldevice_id,
-            self.g.user.wallets[0].adminkey
-          )
-          .then(function (response) {
-            localStorage.setItem('lnurldevice', JSON.stringify(response.data))
-            localStorage.setItem('inkey', self.g.user.wallets[0].inkey)
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      deletelnurldeviceLink: function (lnurldeviceId) {
-        var self = this
-        var link = _.findWhere(this.lnurldeviceLinks, {id: lnurldeviceId})
-        LNbits.utils
-          .confirmDialog('Are you sure you want to delete this pay link?')
-          .onOk(function () {
-            LNbits.api
-              .request(
-                'DELETE',
-                '/lnurldevice/api/v1/lnurlpos/' + lnurldeviceId,
-                self.g.user.wallets[0].adminkey
-              )
-              .then(function (response) {
-                self.lnurldeviceLinks = _.reject(
-                  self.lnurldeviceLinks,
-                  function (obj) {
-                    return obj.id === lnurldeviceId
-                  }
-                )
-              })
-              .catch(function (error) {
-                LNbits.utils.notifyApiError(error)
-              })
-          })
-      },
-      openUpdatelnurldeviceLink: function (lnurldeviceId) {
-        var self = this
-        var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
-          id: lnurldeviceId
-        })
-        self.formDialoglnurldevice.data = _.clone(lnurldevice._data)
-        self.formDialoglnurldevice.show = true
-      },
-      openlnurldeviceSettings: function (lnurldeviceId) {
-        var self = this
-        var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
-          id: lnurldeviceId
-        })
-        self.settingsDialog.data = _.clone(lnurldevice._data)
-        self.settingsDialog.show = true
-      },
-      updatelnurldevice: function (wallet, data) {
-        var self = this
-        var updatedData = {}
-        for (const property in data) {
-          if (data[property]) {
-            updatedData[property] = data[property]
-          }
-        }
-
-        LNbits.api
-          .request(
-            'PUT',
-            '/lnurldevice/api/v1/lnurlpos/' + updatedData.id,
-            wallet,
-            updatedData
-          )
-          .then(function (response) {
-            self.lnurldeviceLinks = _.reject(
-              self.lnurldeviceLinks,
-              function (obj) {
-                return obj.id === updatedData.id
-              }
-            )
-            self.lnurldeviceLinks.push(maplnurldevice(response.data))
-            self.formDialoglnurldevice.show = false
-            self.clearFormDialoglnurldevice()
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      clearFormDialoglnurldevice() {
-        this.formDialoglnurldevice.data = {
-          lnurl_toggle: false,
-          show_message: false,
-          show_ack: false,
-          show_price: 'None',
-          title: ''
-        }
-      },
-      exportlnurldeviceCSV: function () {
-        var self = this
-        LNbits.utils.exportCSV(
-          self.lnurldevicesTable.columns,
-          this.lnurldeviceLinks
-        )
-      }
-    },
-    created: function () {
-      var self = this
-      var getlnurldevices = this.getlnurldevices
-      getlnurldevices()
-      self.location = [
-        window.location.protocol,
-        '//',
-        window.location.host
-      ].join('')
-      LNbits.api
-        .request('GET', '/api/v1/currencies')
-        .then(response => {
-          this.currency = ['USD', ...response.data]
-        })
-        .catch(err => {
-          LNbits.utils.notifyApiError(err)
-        })
-    }
-  })
-</script>
-{% endblock %}
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/paid.html b/lnbits/extensions/nostr/templates/lnurldevice/paid.html
deleted file mode 100644
index c185ecce..00000000
--- a/lnbits/extensions/nostr/templates/lnurldevice/paid.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "public.html" %} {% block page %}
-<div class="row q-col-gutter-md justify-center">
-  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
-    <q-card class="q-pa-lg">
-      <q-card-section class="q-pa-none">
-        <center>
-          <h3 class="q-my-none">{{ pin }}</h3>
-          <br />
-        </center>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  {% endblock %} {% block scripts %}
-
-  <script>
-    new Vue({
-      el: '#vue',
-      mixins: [windowMixin],
-      data: function () {
-        return {}
-      }
-    })
-  </script>
-
-  {% endblock %}
-</div>
diff --git a/lnbits/extensions/nostr/templates/nostr/index.html b/lnbits/extensions/nostr/templates/nostr/index.html
new file mode 100644
index 00000000..f17d0243
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/nostr/index.html
@@ -0,0 +1,159 @@
+{% 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>
+        <div class="row items-center no-wrap q-mb-md">
+          <div class="col">
+            <h5 class="text-subtitle1 q-my-none">Nostr</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="exportlnurldeviceCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          flat
+          dense
+          :data="lnurldeviceLinks"
+          row-key="id"
+          :columns="nostrTable.columns"
+          :pagination.sync="nostrTable.pagination"
+          :filter="filter"
+        >
+          {% raw %}
+          <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
+                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
+                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">{{SITE_TITLE}} Nostr Extension</h6>
+
+        <q-card-section>Okay </q-card-section>
+      </q-card-section>
+    </q-card>
+  </div>
+</div>
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+
+  var maplnurldevice = 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'
+      )
+    }
+    return obj
+  }
+
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        nostrTable: {
+          columns: [
+            {
+              name: 'relay',
+              align: 'left',
+              label: 'relay',
+              field: 'relay'
+            },
+            {
+              name: 'connected',
+              align: 'left',
+              label: 'connected',
+              field: 'connected'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        }
+      }
+    },
+    methods: {
+      getrelays: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/nostr/api/v1/relays',
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.lnurldeviceLinks = response.data.map(maplnurldevice)
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      }
+    },
+    created: function () {
+      var self = this
+      var getrelays = this.getrelays
+      getrelays()
+    }
+  })
+</script>
+{% endblock %}
diff --git a/lnbits/extensions/nostr/views_api.py b/lnbits/extensions/nostr/views_api.py
index a479cad8..9e7ccfff 100644
--- a/lnbits/extensions/nostr/views_api.py
+++ b/lnbits/extensions/nostr/views_api.py
@@ -7,42 +7,18 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnbits.extensions.lnurldevice import lnurldevice_ext
+from lnbits.extensions.nostr import nostr_ext
 from lnbits.utils.exchange_rates import currencies
 
-from . import lnurldevice_ext
+from . import nostr_ext
 from .crud import (
-    create_lnurldevice,
-    delete_lnurldevice,
-    get_lnurldevice,
-    get_lnurldevices,
-    update_lnurldevice,
+    create_nostrkeys,
+    get_nostrkeys,
+    create_nostrnotes,
+    get_nostrnotes,
+    create_nostrrelays,
+    get_nostrrelays,
+    create_nostrconnections,
+    get_nostrconnections,
 )
-from .models import createLnurldevice
-
-
-@nostr_ext.get("/api/v1/lnurlpos")
-async def api_check_daemon(wallet: WalletTypeInfo = Depends(get_key_type)):
-    wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
-    try:
-        return [
-            {**lnurldevice.dict()} for lnurldevice in await get_lnurldevices(wallet_ids)
-        ]
-    except:
-        return ""
-
-@nostr_ext.delete("/api/v1/lnurlpos/{lnurldevice_id}")
-async def api_lnurldevice_delete(
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-    lnurldevice_id: str = Query(None),
-):
-    lnurldevice = await get_lnurldevice(lnurldevice_id)
-
-    if not lnurldevice:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Wallet link does not exist."
-        )
-
-    await delete_lnurldevice(lnurldevice_id)
-
-    return "", HTTPStatus.NO_CONTENT
\ No newline at end of file
+from .models import nostrKeys
\ No newline at end of file

From 29bd8d9ce963b4a9876120fbe4354121680ca32e Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Tue, 8 Feb 2022 10:35:20 +0000
Subject: [PATCH 013/174] Chnaged nostr to nostradmin

---
 .env.example                                  |   2 +-
 lnbits/extensions/nostr/config.json           |   6 -
 lnbits/extensions/nostr/crud.py               | 115 -------------
 lnbits/extensions/nostr/views_api.py          |  24 ---
 .../{nostr => nostradmin}/README.md           |   0
 .../{nostr => nostradmin}/__init__.py         |   7 +-
 lnbits/extensions/nostradmin/config.json      |   6 +
 lnbits/extensions/nostradmin/crud.py          | 156 ++++++++++++++++++
 .../{nostr => nostradmin}/migrations.py       |  32 +++-
 .../{nostr => nostradmin}/models.py           |  14 +-
 .../templates/nostradmin}/index.html          | 130 ++++++++++++++-
 .../extensions/{nostr => nostradmin}/views.py |   2 +-
 lnbits/extensions/nostradmin/views_api.py     |  87 ++++++++++
 13 files changed, 421 insertions(+), 160 deletions(-)
 delete mode 100644 lnbits/extensions/nostr/config.json
 delete mode 100644 lnbits/extensions/nostr/crud.py
 delete mode 100644 lnbits/extensions/nostr/views_api.py
 rename lnbits/extensions/{nostr => nostradmin}/README.md (100%)
 rename lnbits/extensions/{nostr => nostradmin}/__init__.py (51%)
 create mode 100644 lnbits/extensions/nostradmin/config.json
 create mode 100644 lnbits/extensions/nostradmin/crud.py
 rename lnbits/extensions/{nostr => nostradmin}/migrations.py (54%)
 rename lnbits/extensions/{nostr => nostradmin}/models.py (73%)
 rename lnbits/extensions/{nostr/templates/nostr => nostradmin/templates/nostradmin}/index.html (50%)
 rename lnbits/extensions/{nostr => nostradmin}/views.py (90%)
 create mode 100644 lnbits/extensions/nostradmin/views_api.py

diff --git a/.env.example b/.env.example
index 060748a9..0d5b497e 100644
--- a/.env.example
+++ b/.env.example
@@ -8,7 +8,7 @@ PORT=5000
 LNBITS_ALLOWED_USERS=""
 LNBITS_ADMIN_USERS=""
 # Extensions only admin can access
-LNBITS_ADMIN_EXTENSIONS="ngrok"
+LNBITS_ADMIN_EXTENSIONS="nostradmin"
 LNBITS_DEFAULT_WALLET_NAME="LNbits wallet"
 
 # Disable extensions for all users, use "all" to disable all extensions
diff --git a/lnbits/extensions/nostr/config.json b/lnbits/extensions/nostr/config.json
deleted file mode 100644
index a32e39a1..00000000
--- a/lnbits/extensions/nostr/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "Nostr",
-  "short_description": "Daemon for Nostr",
-  "icon": "swap_horizontal_circle",
-  "contributors": ["arcbtc"]
-}
diff --git a/lnbits/extensions/nostr/crud.py b/lnbits/extensions/nostr/crud.py
deleted file mode 100644
index 0b30bc9a..00000000
--- a/lnbits/extensions/nostr/crud.py
+++ /dev/null
@@ -1,115 +0,0 @@
-from typing import List, Optional, Union
-
-from lnbits.helpers import urlsafe_short_hash
-import shortuuid
-from . import db
-from .models import nostrKeys, nostrNotes, nostrCreateRelays, nostrRelays, nostrConnections, nostrCreateConnections
-
-###############KEYS##################
-
-async def create_nostrkeys(
-    data: nostrKeys
-) -> nostrKeys:
-    await db.execute(
-        """
-        INSERT INTO nostr.keys (
-            pubkey,
-            privkey
-        )
-        VALUES (?, ?)
-        """,
-        (data.pubkey, data.privkey),
-    )
-    return await get_nostrkeys(nostrkey_id)
-
-async def get_nostrkeys(pubkey: str) -> nostrKeys:
-    row = await db.fetchone(
-        "SELECT * FROM nostr.keys WHERE pubkey = ?",
-        (pubkey,),
-    )
-    return nostrKeys(**row) if row else None
-
-
-###############NOTES##################
-
-async def create_nostrnotes(
-    data: nostrNotes
-) -> nostrNotes:
-    await db.execute(
-        """
-        INSERT INTO nostr.notes (
-            id,
-            pubkey,
-            created_at,
-            kind,
-            tags,
-            content,
-            sig
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?)
-        """,
-        (data.id, data.pubkey, data.created_at, data.kind, data.tags, data.content, data.sig),
-    )
-    return await get_nostrnotes(data.id)
-
-async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
-    row = await db.fetchone(
-        "SELECT * FROM nostr.notes WHERE id = ?",
-        (nostrnote_id,),
-    )
-    return nostrNotes(**row) if row else None
-
-###############RELAYS##################
-
-async def create_nostrrelays(
-    data: nostrCreateRelays
-) -> nostrCreateRelays:
-    nostrrelay_id = shortuuid.uuid(name=relay)
-    
-    if await get_nostrrelays(nostrrelay_id):
-        return "error"
-    await db.execute(
-        """
-        INSERT INTO nostr.relays (
-            id,
-            relay
-        )
-        VALUES (?, ?)
-        """,
-        (nostrrelay_id, data.relay),
-    )
-    return await get_nostrnotes(nostrrelay_id)
-
-async def get_nostrrelays(nostrrelay_id: str) -> nostrRelays:
-    row = await db.fetchone(
-        "SELECT * FROM nostr.relays WHERE id = ?",
-        (nostrnote_id,),
-    )
-    return nostrRelays(**row) if row else None
-
-
-###############CONNECTIONS##################
-
-async def create_nostrconnections(
-    data: nostrCreateConnections
-) -> nostrCreateConnections:
-    nostrrelay_id = shortuuid.uuid(name=data.relayid + data.pubkey)
-    await db.execute(
-        """
-        INSERT INTO nostr.connections (
-            id,
-            pubkey,
-            relayid
-        )
-        VALUES (?, ?, ?)
-        """,
-        (data.id, data.pubkey, data.relayid),
-    )
-    return await get_nostrconnections(data.id)
-
-async def get_nostrconnections(nostrconnections_id: str) -> nostrConnections:
-    row = await db.fetchone(
-        "SELECT * FROM nostr.connections WHERE id = ?",
-        (nostrconnections_id,),
-    )
-    return nostrConnections(**row) if row else None
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/views_api.py b/lnbits/extensions/nostr/views_api.py
deleted file mode 100644
index 9e7ccfff..00000000
--- a/lnbits/extensions/nostr/views_api.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from http import HTTPStatus
-
-from fastapi import Request
-from fastapi.param_functions import Query
-from fastapi.params import Depends
-from starlette.exceptions import HTTPException
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnbits.extensions.nostr import nostr_ext
-from lnbits.utils.exchange_rates import currencies
-
-from . import nostr_ext
-from .crud import (
-    create_nostrkeys,
-    get_nostrkeys,
-    create_nostrnotes,
-    get_nostrnotes,
-    create_nostrrelays,
-    get_nostrrelays,
-    create_nostrconnections,
-    get_nostrconnections,
-)
-from .models import nostrKeys
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/README.md b/lnbits/extensions/nostradmin/README.md
similarity index 100%
rename from lnbits/extensions/nostr/README.md
rename to lnbits/extensions/nostradmin/README.md
diff --git a/lnbits/extensions/nostr/__init__.py b/lnbits/extensions/nostradmin/__init__.py
similarity index 51%
rename from lnbits/extensions/nostr/__init__.py
rename to lnbits/extensions/nostradmin/__init__.py
index 9774a279..7034ca46 100644
--- a/lnbits/extensions/nostr/__init__.py
+++ b/lnbits/extensions/nostradmin/__init__.py
@@ -3,13 +3,14 @@ from fastapi import APIRouter
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
 
-db = Database("ext_nostr")
+db = Database("ext_nostradmin")
 
-nostr_ext: APIRouter = APIRouter(prefix="/nostr", tags=["nostr"])
+nostr_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
 
 
 def nostr_renderer():
-    return template_renderer(["lnbits/extensions/nostr/templates"])
+    return template_renderer(["lnbits/extensions/nostradmin/templates"])
+
 
 from .views import *  # noqa
 from .views_api import *  # noqa
diff --git a/lnbits/extensions/nostradmin/config.json b/lnbits/extensions/nostradmin/config.json
new file mode 100644
index 00000000..2c4f76d3
--- /dev/null
+++ b/lnbits/extensions/nostradmin/config.json
@@ -0,0 +1,6 @@
+{
+  "name": "NostrAdmin",
+  "short_description": "Admin daemon for Nostr",
+  "icon": "swap_horizontal_circle",
+  "contributors": ["arcbtc"]
+}
diff --git a/lnbits/extensions/nostradmin/crud.py b/lnbits/extensions/nostradmin/crud.py
new file mode 100644
index 00000000..08908e85
--- /dev/null
+++ b/lnbits/extensions/nostradmin/crud.py
@@ -0,0 +1,156 @@
+from typing import List, Optional, Union
+
+from lnbits.helpers import urlsafe_short_hash
+import shortuuid
+from . import db
+from .models import (
+    nostrKeys,
+    nostrNotes,
+    nostrCreateRelays,
+    nostrRelays,
+    nostrConnections,
+    nostrCreateConnections,
+    nostrRelayList,
+)
+
+###############KEYS##################
+
+
+async def create_nostrkeys(data: nostrKeys) -> nostrKeys:
+    await db.execute(
+        """
+        INSERT INTO nostradmin.keys (
+            pubkey,
+            privkey
+        )
+        VALUES (?, ?)
+        """,
+        (data.pubkey, data.privkey),
+    )
+    return await get_nostrkeys(nostrkey_id)
+
+
+async def get_nostrkeys(pubkey: str) -> nostrKeys:
+    row = await db.fetchone("SELECT * FROM nostradmin.keys WHERE pubkey = ?", (pubkey,))
+    return nostrKeys(**row) if row else None
+
+
+###############NOTES##################
+
+
+async def create_nostrnotes(data: nostrNotes) -> nostrNotes:
+    await db.execute(
+        """
+        INSERT INTO nostradmin.notes (
+            id,
+            pubkey,
+            created_at,
+            kind,
+            tags,
+            content,
+            sig
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+        """,
+        (
+            data.id,
+            data.pubkey,
+            data.created_at,
+            data.kind,
+            data.tags,
+            data.content,
+            data.sig,
+        ),
+    )
+    return await get_nostrnotes(data.id)
+
+
+async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
+    row = await db.fetchone("SELECT * FROM nostradmin.notes WHERE id = ?", (nostrnote_id,))
+    return nostrNotes(**row) if row else None
+
+
+###############RELAYS##################
+
+
+async def create_nostrrelays(data: nostrCreateRelays) -> nostrCreateRelays:
+    nostrrelay_id = shortuuid.uuid(name=data.relay)
+
+    if await get_nostrrelay(nostrrelay_id):
+        return "error"
+    await db.execute(
+        """
+        INSERT INTO nostradmin.relays (
+            id,
+            relay
+        )
+        VALUES (?, ?)
+        """,
+        (nostrrelay_id, data.relay),
+    )
+    return await get_nostrrelay(nostrrelay_id)
+
+
+async def get_nostrrelays() -> nostrRelays:
+    rows = await db.fetchall("SELECT * FROM nostradmin.relays")
+    return [nostrRelays(**row) for row in rows]
+
+
+async def get_nostrrelay(nostrrelay_id: str) -> nostrRelays:
+    row = await db.fetchone("SELECT * FROM nostradmin.relays WHERE id = ?", (nostrrelay_id,))
+    return nostrRelays(**row) if row else None
+
+
+async def update_nostrrelayallowlist(allowlist: str) -> nostrRelayList:
+    await db.execute(
+        """
+        UPDATE nostradmin.relaylist SET
+          allowlist = ?
+        WHERE id = ?
+        """,
+        (allowlist, 1),
+    )
+    return await get_nostrrelaylist()
+
+async def update_nostrrelaydenylist(denylist: str) -> nostrRelayList:
+    await db.execute(
+        """
+        UPDATE nostradmin.relaylist SET
+          denylist = ?
+        WHERE id = ?
+        """,
+        (denylist, 1),
+    )
+    return await get_nostrrelaylist()
+
+async def get_nostrrelaylist() -> nostrRelayList:
+    row = await db.fetchone("SELECT * FROM nostradmin.relaylist WHERE id = ?", (1,))
+    return nostrRelayList(**row) if row else None
+
+
+###############CONNECTIONS##################
+
+
+async def create_nostrconnections(
+    data: nostrCreateConnections
+) -> nostrCreateConnections:
+    nostrrelay_id = shortuuid.uuid(name=data.relayid + data.pubkey)
+    await db.execute(
+        """
+        INSERT INTO nostradmin.connections (
+            id,
+            pubkey,
+            relayid
+        )
+        VALUES (?, ?, ?)
+        """,
+        (data.id, data.pubkey, data.relayid),
+    )
+    return await get_nostrconnections(data.id)
+
+
+async def get_nostrconnections(nostrconnections_id: str) -> nostrConnections:
+    row = await db.fetchone(
+        "SELECT * FROM nostradmin.connections WHERE id = ?", (nostrconnections_id,)
+    )
+    return nostrConnections(**row) if row else None
diff --git a/lnbits/extensions/nostr/migrations.py b/lnbits/extensions/nostradmin/migrations.py
similarity index 54%
rename from lnbits/extensions/nostr/migrations.py
rename to lnbits/extensions/nostradmin/migrations.py
index 0c616110..09b28117 100644
--- a/lnbits/extensions/nostr/migrations.py
+++ b/lnbits/extensions/nostradmin/migrations.py
@@ -9,7 +9,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE nostr.keys (
+        CREATE TABLE nostradmin.keys (
             pubkey TEXT NOT NULL PRIMARY KEY,
             privkey TEXT NOT NULL
         );
@@ -17,7 +17,7 @@ async def m001_initial(db):
     )
     await db.execute(
         f"""
-        CREATE TABLE nostr.notes (
+        CREATE TABLE nostradmin.notes (
             id TEXT NOT NULL PRIMARY KEY,
             pubkey TEXT NOT NULL,
             created_at TEXT NOT NULL,
@@ -30,7 +30,7 @@ async def m001_initial(db):
     )
     await db.execute(
         f"""
-        CREATE TABLE nostr.relays (
+        CREATE TABLE nostradmin.relays (
             id TEXT NOT NULL PRIMARY KEY,
             relay TEXT NOT NULL
         );
@@ -38,10 +38,32 @@ async def m001_initial(db):
     )
     await db.execute(
         f"""
-        CREATE TABLE nostr.connections (
+        CREATE TABLE nostradmin.relaylists (
+            id TEXT NOT NULL PRIMARY KEY DEFAULT 1,
+            allowlist TEXT NOT NULL,
+            denylist TEXT NOT NULL
+        );
+    """
+    )
+    try:
+        await db.execute(
+            """
+            INSERT INTO nostradmin.relaylist (
+                id,
+                denylist
+            )
+            VALUES (?, ?,)
+            """,
+            (1, "\n".join(["wss://zucks-meta-relay.com", "wss://nostradmin.cia.gov"])),
+        )
+    except:
+        return
+    await db.execute(
+        f"""
+        CREATE TABLE nostradmin.connections (
             id TEXT NOT NULL PRIMARY KEY,
             publickey TEXT NOT NULL,
             relayid TEXT NOT NULL
         );
     """
-    )
\ No newline at end of file
+    )
diff --git a/lnbits/extensions/nostr/models.py b/lnbits/extensions/nostradmin/models.py
similarity index 73%
rename from lnbits/extensions/nostr/models.py
rename to lnbits/extensions/nostradmin/models.py
index e21e5d76..fd89f515 100644
--- a/lnbits/extensions/nostr/models.py
+++ b/lnbits/extensions/nostradmin/models.py
@@ -6,6 +6,7 @@ from fastapi import Request
 from pydantic import BaseModel
 from pydantic.main import BaseModel
 
+
 class nostrKeys(BaseModel):
     pubkey: str
     privkey: str
@@ -30,7 +31,18 @@ class nostrRelays(BaseModel):
     id: str
     relay: str
 
+class nostrRelayList(BaseModel):
+    id: str
+    allowlist: str
+    denylist: str
+
+class nostrRelayDenyList(BaseModel):
+    denylist: str
+
+class nostrRelayAllowList(BaseModel):
+    allowlist: str
+
 class nostrConnections(BaseModel):
     id: str
     pubkey: str
-    relayid: str
\ No newline at end of file
+    relayid: str
diff --git a/lnbits/extensions/nostr/templates/nostr/index.html b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
similarity index 50%
rename from lnbits/extensions/nostr/templates/nostr/index.html
rename to lnbits/extensions/nostradmin/templates/nostradmin/index.html
index f17d0243..adab98e2 100644
--- a/lnbits/extensions/nostr/templates/nostr/index.html
+++ b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
@@ -71,12 +71,77 @@
         </q-table>
       </q-card-section>
     </q-card>
+    <q-card>
+      <q-tabs
+        v-model="listSelection"
+        dense
+        class="text-grey"
+        active-color="primary"
+        indicator-color="primary"
+        align="justify"
+        narrow-indicator
+      >
+        <q-tab name="denylist" label="Deny List" />
+        <q-tab name="allowlist" label="Allow List" />
+      </q-tabs>
+
+      <q-separator />
+
+      <q-tab-panels v-model="tab" animated>
+        <q-tab-panel name="denylist">
+          <div class="text-h6">
+            Deny List (denys use of relays in this list)
+          </div>
+          <q-form class="q-gutter-md q-y-md" @submit="setDenyList">
+            <div class="row">
+              <div class="col q-mx-lg">
+                <q-input v-model="denyList" dense filled autogrow />
+              </div>
+              <div
+                class="col q-mx-lg items-align flex items-center justify-center"
+              >
+                <q-btn unelevated color="primary" type="submit">
+                  Update Deny List
+                </q-btn>
+                <q-btn @click="loadShop" flat color="grey" class="q-ml-auto"
+                  >Reset</q-btn
+                >
+              </div>
+            </div>
+          </q-form>
+        </q-tab-panel>
+
+        <q-tab-panel name="allowlist">
+          <div class="text-h6">
+            Allow List (denys any relays not in this list)
+          </div>
+          <q-form class="q-gutter-md q-y-md" @submit="setAllowList">
+            <div class="row">
+              <div class="col q-mx-lg">
+                <q-input v-model="allowList" dense filled autogrow />
+              </div>
+              <div
+                class="col q-mx-lg items-align flex items-center justify-center"
+              >
+                <q-btn unelevated color="primary" type="submit">
+                  Update Allow List
+                </q-btn>
+                <q-btn @click="loadShop" flat color="grey" class="q-ml-auto"
+                  >Reset</q-btn
+                >
+              </div>
+            </div>
+          </q-form>
+        </q-tab-panel>
+      </q-tab-panels>
+    </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">{{SITE_TITLE}} Nostr Extension</h6>
+        <p>Only Admin users can manage this extension</p>
 
         <q-card-section>Okay </q-card-section>
       </q-card-section>
@@ -109,6 +174,9 @@
     mixins: [windowMixin],
     data: function () {
       return {
+        listSelection: 'denylist',
+        allowList: [],
+        denyList: [],
         nostrTable: {
           columns: [
             {
@@ -136,12 +204,66 @@
         LNbits.api
           .request(
             'GET',
-            '/nostr/api/v1/relays',
+            '/nostradmin/api/v1/relays',
             self.g.user.wallets[0].adminkey
           )
           .then(function (response) {
             if (response.data) {
-              self.lnurldeviceLinks = response.data.map(maplnurldevice)
+              self.nostrrelayLinks = response.data.map(maprelays)
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      setAllowList: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'POST',
+            '/nostradmin/api/v1/allowlist',
+            self.g.user.wallets[0].adminkey,
+            self.allowList
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.allowList = response.data
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      setDenyList: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'POST',
+            '/nostradmin/api/v1/denylist',
+            self.g.user.wallets[0].adminkey,
+            self.allowList
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.denyList = response.data
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getLists: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/nostradmin/api/v1/relaylist',
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.denyList = response.data.denylist
+              self.allowList = response.data.allowlist
             }
           })
           .catch(function (error) {
@@ -151,8 +273,8 @@
     },
     created: function () {
       var self = this
-      var getrelays = this.getrelays
-      getrelays()
+      this.getrelays()
+      this.getLists()
     }
   })
 </script>
diff --git a/lnbits/extensions/nostr/views.py b/lnbits/extensions/nostradmin/views.py
similarity index 90%
rename from lnbits/extensions/nostr/views.py
rename to lnbits/extensions/nostradmin/views.py
index 1dfc07da..5609c218 100644
--- a/lnbits/extensions/nostr/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -20,5 +20,5 @@ templates = Jinja2Templates(directory="templates")
 @nostr_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return nostr_renderer().TemplateResponse(
-        "nostr/index.html", {"request": request, "user": user.dict()}
+        "nostradmin/index.html", {"request": request, "user": user.dict()}
     )
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
new file mode 100644
index 00000000..da6e140b
--- /dev/null
+++ b/lnbits/extensions/nostradmin/views_api.py
@@ -0,0 +1,87 @@
+from http import HTTPStatus
+import asyncio
+from fastapi import Request
+from fastapi.param_functions import Query
+from fastapi.params import Depends
+from starlette.exceptions import HTTPException
+
+from lnbits.core.crud import get_user
+from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
+from lnbits.extensions.nostr import nostr_ext
+from lnbits.utils.exchange_rates import currencies
+
+from . import nostr_ext
+from lnbits.settings import LNBITS_ADMIN_USERS
+from .crud import (
+    create_nostrkeys,
+    get_nostrkeys,
+    create_nostrnotes,
+    get_nostrnotes,
+    create_nostrrelays,
+    get_nostrrelays,
+    get_nostrrelaylist,
+    update_nostrrelayallowlist,
+    update_nostrrelaydenylist,
+    create_nostrconnections,
+    get_nostrconnections,
+)
+from .models import nostrKeys, nostrCreateRelays, nostrRelayAllowList, nostrRelayDenyList
+
+
+# while True:
+async def nostr_subscribe():
+    return
+    # for the relays:
+    # async with websockets.connect("ws://localhost:8765") as websocket:
+    # for the public keys:
+    # await websocket.send("subscribe to events")
+    # await websocket.recv()
+
+
+websocket_queue = asyncio.Queue(1000)
+
+
+async def internal_invoice_listener():
+    while True:
+        checking_id = await internal_invoice_queue.get()
+        asyncio.create_task(invoice_callback_dispatcher(checking_id))
+
+
+@nostr_ext.get("/api/v1/relays")
+async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
+
+    relays = await get_nostrrelays()
+    if not relays:
+        await create_nostrrelays(nostrCreateRelays(relay="wss://relayer.fiatjaf.com"))
+        await create_nostrrelays(
+            nostrCreateRelays(relay="wss://nostr-pub.wellorder.net")
+        )
+        relays = await get_nostrrelays()
+    try:
+        return [{**relays.dict()} for relays in await relays]
+    except:
+        None
+
+@nostr_ext.get("/api/v1/relaylist")
+async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):
+    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+    return await get_nostrrelaylist()
+
+@nostr_ext.post("/api/v1/allowlist")
+async def api_relaysallowed(data: nostrRelayAllowList, wallet: WalletTypeInfo = Depends(get_key_type)):
+    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+    return await update_nostrrelayallowlist(data)
+
+@nostr_ext.post("/api/v1/denylist")
+async def api_relaysdenyed(data: nostrRelayDenyList, wallet: WalletTypeInfo = Depends(get_key_type)):
+    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+    return await update_nostrrelaydenylist(data)
\ No newline at end of file

From 2083ecbc27b00ad4aca605425a183b8122e7d995 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Tue, 8 Feb 2022 13:13:36 +0000
Subject: [PATCH 014/174] models decided

---
 lnbits/extensions/nostradmin/__init__.py      |  2 +-
 lnbits/extensions/nostradmin/crud.py          | 22 ++----
 lnbits/extensions/nostradmin/migrations.py    | 41 ++++++-----
 lnbits/extensions/nostradmin/models.py        | 33 +++++----
 .../templates/nostradmin/index.html           | 71 +++++++++++--------
 lnbits/extensions/nostradmin/views.py         |  5 +-
 lnbits/extensions/nostradmin/views_api.py     | 33 +++------
 7 files changed, 100 insertions(+), 107 deletions(-)

diff --git a/lnbits/extensions/nostradmin/__init__.py b/lnbits/extensions/nostradmin/__init__.py
index 7034ca46..797542c4 100644
--- a/lnbits/extensions/nostradmin/__init__.py
+++ b/lnbits/extensions/nostradmin/__init__.py
@@ -5,7 +5,7 @@ from lnbits.helpers import template_renderer
 
 db = Database("ext_nostradmin")
 
-nostr_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
+nostradmin_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
 
 
 def nostr_renderer():
diff --git a/lnbits/extensions/nostradmin/crud.py b/lnbits/extensions/nostradmin/crud.py
index 08908e85..1e1bf810 100644
--- a/lnbits/extensions/nostradmin/crud.py
+++ b/lnbits/extensions/nostradmin/crud.py
@@ -12,6 +12,7 @@ from .models import (
     nostrCreateConnections,
     nostrRelayList,
 )
+from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
 
 ###############KEYS##################
 
@@ -100,31 +101,20 @@ async def get_nostrrelay(nostrrelay_id: str) -> nostrRelays:
     row = await db.fetchone("SELECT * FROM nostradmin.relays WHERE id = ?", (nostrrelay_id,))
     return nostrRelays(**row) if row else None
 
-
-async def update_nostrrelayallowlist(allowlist: str) -> nostrRelayList:
+async def update_nostrrelaysetlist(data: nostrRelaySetList) -> nostrRelayList:
     await db.execute(
         """
-        UPDATE nostradmin.relaylist SET
+        UPDATE nostradmin.relaylists SET
+          denylist = ?,
           allowlist = ?
         WHERE id = ?
         """,
-        (allowlist, 1),
-    )
-    return await get_nostrrelaylist()
-
-async def update_nostrrelaydenylist(denylist: str) -> nostrRelayList:
-    await db.execute(
-        """
-        UPDATE nostradmin.relaylist SET
-          denylist = ?
-        WHERE id = ?
-        """,
-        (denylist, 1),
+        (data.denylist, data.allowlist, 1),
     )
     return await get_nostrrelaylist()
 
 async def get_nostrrelaylist() -> nostrRelayList:
-    row = await db.fetchone("SELECT * FROM nostradmin.relaylist WHERE id = ?", (1,))
+    row = await db.fetchone("SELECT * FROM nostradmin.relaylists WHERE id = ?", (1,))
     return nostrRelayList(**row) if row else None
 
 
diff --git a/lnbits/extensions/nostradmin/migrations.py b/lnbits/extensions/nostradmin/migrations.py
index 09b28117..590f72ea 100644
--- a/lnbits/extensions/nostradmin/migrations.py
+++ b/lnbits/extensions/nostradmin/migrations.py
@@ -1,11 +1,8 @@
 from lnbits.db import Database
 
-db2 = Database("ext_nostr")
-
-
 async def m001_initial(db):
     """
-    Initial nostr table.
+    Initial nostradmin table.
     """
     await db.execute(
         f"""
@@ -40,24 +37,23 @@ async def m001_initial(db):
         f"""
         CREATE TABLE nostradmin.relaylists (
             id TEXT NOT NULL PRIMARY KEY DEFAULT 1,
-            allowlist TEXT NOT NULL,
-            denylist TEXT NOT NULL
+            allowlist TEXT,
+            denylist TEXT
         );
     """
     )
-    try:
-        await db.execute(
-            """
-            INSERT INTO nostradmin.relaylist (
-                id,
-                denylist
-            )
-            VALUES (?, ?,)
-            """,
-            (1, "\n".join(["wss://zucks-meta-relay.com", "wss://nostradmin.cia.gov"])),
+
+    await db.execute(
+        """
+        INSERT INTO nostradmin.relaylists (
+            id,
+            denylist
         )
-    except:
-        return
+        VALUES (?, ?)
+        """,
+        ("1", "wss://zucks-meta-relay.com\nwss://nostr.cia.gov",),
+    )
+
     await db.execute(
         f"""
         CREATE TABLE nostradmin.connections (
@@ -67,3 +63,12 @@ async def m001_initial(db):
         );
     """
     )
+    await db.execute(
+        f"""
+        CREATE TABLE nostradmin.subscribed (
+            id TEXT NOT NULL PRIMARY KEY,
+            userPubkey TEXT NOT NULL,
+            subscribedPubkey TEXT NOT NULL
+        );
+    """
+    )
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/models.py b/lnbits/extensions/nostradmin/models.py
index fd89f515..1968567f 100644
--- a/lnbits/extensions/nostradmin/models.py
+++ b/lnbits/extensions/nostradmin/models.py
@@ -5,7 +5,7 @@ from typing import Optional
 from fastapi import Request
 from pydantic import BaseModel
 from pydantic.main import BaseModel
-
+from fastapi.param_functions import Query
 
 class nostrKeys(BaseModel):
     pubkey: str
@@ -21,28 +21,31 @@ class nostrNotes(BaseModel):
     sig: str
 
 class nostrCreateRelays(BaseModel):
-    relay: str
+    relay: str = Query(None)
 
 class nostrCreateConnections(BaseModel):
-    pubkey: str
-    relayid: str
+    pubkey: str = Query(None)
+    relayid: str = Query(None)
 
 class nostrRelays(BaseModel):
-    id: str
-    relay: str
+    id: Optional[str]
+    relay: Optional[str]
 
 class nostrRelayList(BaseModel):
     id: str
-    allowlist: str
-    denylist: str
+    allowlist: Optional[str]
+    denylist: Optional[str]
 
-class nostrRelayDenyList(BaseModel):
-    denylist: str
-
-class nostrRelayAllowList(BaseModel):
-    allowlist: str
+class nostrRelaySetList(BaseModel):
+    allowlist: Optional[str]
+    denylist: Optional[str] 
 
 class nostrConnections(BaseModel):
     id: str
-    pubkey: str
-    relayid: str
+    pubkey: Optional[str]
+    relayid: Optional[str]
+
+class nostrSubscriptions(BaseModel):
+    id: str
+    userPubkey: Optional[str]
+    subscribedPubkey: Optional[str]
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/templates/nostradmin/index.html b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
index adab98e2..27decdc8 100644
--- a/lnbits/extensions/nostradmin/templates/nostradmin/index.html
+++ b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
@@ -6,7 +6,7 @@
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Nostr</h5>
+            <h5 class="text-subtitle1 q-my-none">NOSTR RELAYS ONLINE</h5>
           </div>
 
           <div class="col-auto">
@@ -29,7 +29,7 @@
         <q-table
           flat
           dense
-          :data="lnurldeviceLinks"
+          :data="nostrLinks"
           row-key="id"
           :columns="nostrTable.columns"
           :pagination.sync="nostrTable.pagination"
@@ -81,21 +81,24 @@
         align="justify"
         narrow-indicator
       >
-        <q-tab name="denylist" label="Deny List" />
-        <q-tab name="allowlist" label="Allow List" />
+        <q-tab name="denylist" label="Deny List"></q-tab>
+        <q-tab name="allowlist" label="Allow List"></q-tab>
       </q-tabs>
 
-      <q-separator />
+      <q-separator></q-separator>
 
-      <q-tab-panels v-model="tab" animated>
+      <q-tab-panels v-model="listSelection" animated>
         <q-tab-panel name="denylist">
-          <div class="text-h6">
-            Deny List (denys use of relays in this list)
-          </div>
-          <q-form class="q-gutter-md q-y-md" @submit="setDenyList">
+          <div class="text-h6">Relays in this list will NOT be used</div>
+          <q-form class="q-gutter-md q-y-md" @submit="setRelayList">
             <div class="row">
               <div class="col q-mx-lg">
-                <q-input v-model="denyList" dense filled autogrow />
+                <q-input
+                  v-model="setList.denylist"
+                  dense
+                  filled
+                  autogrow
+                ></q-input>
               </div>
               <div
                 class="col q-mx-lg items-align flex items-center justify-center"
@@ -103,22 +106,22 @@
                 <q-btn unelevated color="primary" type="submit">
                   Update Deny List
                 </q-btn>
-                <q-btn @click="loadShop" flat color="grey" class="q-ml-auto"
-                  >Reset</q-btn
-                >
               </div>
             </div>
           </q-form>
         </q-tab-panel>
 
         <q-tab-panel name="allowlist">
-          <div class="text-h6">
-            Allow List (denys any relays not in this list)
-          </div>
-          <q-form class="q-gutter-md q-y-md" @submit="setAllowList">
+          <div class="text-h6">ONLY relays in this list will be used</div>
+          <q-form class="q-gutter-md q-y-md" @submit="setRelayList">
             <div class="row">
               <div class="col q-mx-lg">
-                <q-input v-model="allowList" dense filled autogrow />
+                <q-input
+                  v-model="setList.allowlist"
+                  dense
+                  filled
+                  autogrow
+                ></q-input>
               </div>
               <div
                 class="col q-mx-lg items-align flex items-center justify-center"
@@ -126,9 +129,6 @@
                 <q-btn unelevated color="primary" type="submit">
                   Update Allow List
                 </q-btn>
-                <q-btn @click="loadShop" flat color="grey" class="q-ml-auto"
-                  >Reset</q-btn
-                >
               </div>
             </div>
           </q-form>
@@ -175,8 +175,12 @@
     data: function () {
       return {
         listSelection: 'denylist',
-        allowList: [],
-        denyList: [],
+        setList: {
+          allowlist: '',
+          denylist: ''
+        },
+        nostrLinks: [],
+        filter: '',
         nostrTable: {
           columns: [
             {
@@ -234,18 +238,20 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      setDenyList: function () {
+      setRelayList: function () {
         var self = this
+        console.log(self.setList)
         LNbits.api
           .request(
             'POST',
-            '/nostradmin/api/v1/denylist',
+            '/nostradmin/api/v1/setlist',
             self.g.user.wallets[0].adminkey,
-            self.allowList
+            self.setList
           )
           .then(function (response) {
             if (response.data) {
-              self.denyList = response.data
+              console.log(response.data)
+              // self.denyList = response.data
             }
           })
           .catch(function (error) {
@@ -262,13 +268,18 @@
           )
           .then(function (response) {
             if (response.data) {
-              self.denyList = response.data.denylist
-              self.allowList = response.data.allowlist
+              console.log(response.data)
+              self.setList.denylist = response.data.denylist
+              self.setList.allowlist = response.data.allowlist
             }
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
+      },
+      exportlnurldeviceCSV: function () {
+        var self = this
+        LNbits.utils.exportCSV(self.nostrTable.columns, this.nostrLinks)
       }
     },
     created: function () {
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 5609c218..51297320 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -6,18 +6,19 @@ from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
+from . import nostradmin_ext, nostr_renderer
 
 from lnbits.core.crud import update_payment_status
 from lnbits.core.models import User
 from lnbits.core.views.api import api_payment
 from lnbits.decorators import check_user_exists
 
-from . import nostr_ext, nostr_renderer
+
 
 templates = Jinja2Templates(directory="templates")
 
 
-@nostr_ext.get("/", response_class=HTMLResponse)
+@nostradmin_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return nostr_renderer().TemplateResponse(
         "nostradmin/index.html", {"request": request, "user": user.dict()}
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
index da6e140b..d79315ac 100644
--- a/lnbits/extensions/nostradmin/views_api.py
+++ b/lnbits/extensions/nostradmin/views_api.py
@@ -7,11 +7,10 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnbits.extensions.nostr import nostr_ext
 from lnbits.utils.exchange_rates import currencies
 
-from . import nostr_ext
 from lnbits.settings import LNBITS_ADMIN_USERS
+from . import nostradmin_ext
 from .crud import (
     create_nostrkeys,
     get_nostrkeys,
@@ -20,13 +19,11 @@ from .crud import (
     create_nostrrelays,
     get_nostrrelays,
     get_nostrrelaylist,
-    update_nostrrelayallowlist,
-    update_nostrrelaydenylist,
+    update_nostrrelaysetlist,
     create_nostrconnections,
     get_nostrconnections,
 )
-from .models import nostrKeys, nostrCreateRelays, nostrRelayAllowList, nostrRelayDenyList
-
+from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
 
 # while True:
 async def nostr_subscribe():
@@ -41,13 +38,7 @@ async def nostr_subscribe():
 websocket_queue = asyncio.Queue(1000)
 
 
-async def internal_invoice_listener():
-    while True:
-        checking_id = await internal_invoice_queue.get()
-        asyncio.create_task(invoice_callback_dispatcher(checking_id))
-
-
-@nostr_ext.get("/api/v1/relays")
+@nostradmin_ext.get("/api/v1/relays")
 async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
 
     relays = await get_nostrrelays()
@@ -62,7 +53,7 @@ async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
     except:
         None
 
-@nostr_ext.get("/api/v1/relaylist")
+@nostradmin_ext.get("/api/v1/relaylist")
 async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):
     if wallet.wallet.user not in LNBITS_ADMIN_USERS:
         raise HTTPException(
@@ -70,18 +61,10 @@ async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):
         )
     return await get_nostrrelaylist()
 
-@nostr_ext.post("/api/v1/allowlist")
-async def api_relaysallowed(data: nostrRelayAllowList, wallet: WalletTypeInfo = Depends(get_key_type)):
+@nostradmin_ext.post("/api/v1/setlist")
+async def api_relayssetlist(data: nostrRelaySetList, wallet: WalletTypeInfo = Depends(get_key_type)):
     if wallet.wallet.user not in LNBITS_ADMIN_USERS:
         raise HTTPException(
             status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
         )
-    return await update_nostrrelayallowlist(data)
-
-@nostr_ext.post("/api/v1/denylist")
-async def api_relaysdenyed(data: nostrRelayDenyList, wallet: WalletTypeInfo = Depends(get_key_type)):
-    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
-        )
-    return await update_nostrrelaydenylist(data)
\ No newline at end of file
+    return await update_nostrrelaysetlist(data)
\ No newline at end of file

From 21c316293b4c8986854ade1421e4119fc6e4e5bb Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Tue, 8 Feb 2022 13:52:19 +0000
Subject: [PATCH 015/174] Started planning websocket daemon

---
 lnbits/extensions/nostradmin/views.py     | 70 ++++++++++++++++++++++-
 lnbits/extensions/nostradmin/views_api.py | 12 ----
 2 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 51297320..235ec7e9 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -1,5 +1,6 @@
 from http import HTTPStatus
-
+import asyncio
+import asyncio
 from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
@@ -7,13 +8,14 @@ from fastapi.templating import Jinja2Templates
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
 from . import nostradmin_ext, nostr_renderer
+from fastapi import Request, WebSocket, WebSocketDisconnect
 
 from lnbits.core.crud import update_payment_status
 from lnbits.core.models import User
 from lnbits.core.views.api import api_payment
 from lnbits.decorators import check_user_exists
 
-
+from .crud import get_nostrkeys
 
 templates = Jinja2Templates(directory="templates")
 
@@ -23,3 +25,67 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
     return nostr_renderer().TemplateResponse(
         "nostradmin/index.html", {"request": request, "user": user.dict()}
     )
+
+#####################################################################
+#################### NOSTR WEBSOCKET THREAD #########################
+##### THE QUEUE LOOP THREAD THING THAT LISTENS TO BUNCH OF ##########
+### WEBSOCKET CONNECTIONS, STORING DATA IN DB/PUSHING TO FRONTEND ###
+################### VIA updater() FUNCTION ##########################
+#####################################################################
+
+websocket_queue = asyncio.Queue(1000)
+
+# while True:
+async def nostr_subscribe():
+    return
+    # for the relays:
+    # async with websockets.connect("ws://localhost:8765") as websocket:
+    # for the public keys:
+    # await websocket.send("subscribe to events")
+    # await websocket.recv()
+
+#####################################################################
+################### LNBITS WEBSOCKET ROUTES #########################
+#### HERE IS WHERE LNBITS FRONTEND CAN RECEIVE AND SEND MESSAGES ####
+#####################################################################
+
+class ConnectionManager:
+    def __init__(self):
+        self.active_connections: List[WebSocket] = []
+
+    async def connect(self, websocket: WebSocket, nostr_id: str):
+        await websocket.accept()
+        websocket.id = nostr_id
+        self.active_connections.append(websocket)
+
+    def disconnect(self, websocket: WebSocket):
+        self.active_connections.remove(websocket)
+
+    async def send_personal_message(self, message: str, nostr_id: str):
+        for connection in self.active_connections:
+            if connection.id == nostr_id:
+                await connection.send_text(message)
+
+    async def broadcast(self, message: str):
+        for connection in self.active_connections:
+            await connection.send_text(message)
+
+
+manager = ConnectionManager()
+
+
+@nostradmin_ext.websocket("/nostradmin/ws/{nostr_id}", name="copilot.websocket_by_id")
+async def websocket_endpoint(websocket: WebSocket, copilot_id: str):
+    await manager.connect(websocket, nostr_id)
+    try:
+        while True:
+            data = await websocket.receive_text()
+    except WebSocketDisconnect:
+        manager.disconnect(websocket)
+
+
+async def updater(nostr_id, message):
+    copilot = await get_copilot(nostr_id)
+    if not copilot:
+        return
+    await manager.send_personal_message(f"{message}", nostr_id)
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
index d79315ac..ad8bcf17 100644
--- a/lnbits/extensions/nostradmin/views_api.py
+++ b/lnbits/extensions/nostradmin/views_api.py
@@ -25,18 +25,6 @@ from .crud import (
 )
 from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
 
-# while True:
-async def nostr_subscribe():
-    return
-    # for the relays:
-    # async with websockets.connect("ws://localhost:8765") as websocket:
-    # for the public keys:
-    # await websocket.send("subscribe to events")
-    # await websocket.recv()
-
-
-websocket_queue = asyncio.Queue(1000)
-
 
 @nostradmin_ext.get("/api/v1/relays")
 async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):

From 0a5495f185a87a2aee8a2efd78b7dff0ad5d2384 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Tue, 8 Feb 2022 14:02:50 +0000
Subject: [PATCH 016/174] typo

---
 lnbits/extensions/nostradmin/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 235ec7e9..f00c43a3 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -74,7 +74,7 @@ class ConnectionManager:
 manager = ConnectionManager()
 
 
-@nostradmin_ext.websocket("/nostradmin/ws/{nostr_id}", name="copilot.websocket_by_id")
+@nostradmin_ext.websocket("/nostradmin/ws/{nostr_id}", name="nostr_id.websocket_by_id")
 async def websocket_endpoint(websocket: WebSocket, copilot_id: str):
     await manager.connect(websocket, nostr_id)
     try:

From 6917813e2af357138bebb2df31d00be6148b7553 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 10 Feb 2022 09:58:50 +0000
Subject: [PATCH 017/174] Working, looking good

---
 lnbits/extensions/nostradmin/models.py        |  1 +
 .../templates/nostradmin/index.html           | 39 ++++++++++++-------
 lnbits/extensions/nostradmin/views.py         | 21 +++++++---
 lnbits/extensions/nostradmin/views_api.py     | 17 +++++---
 4 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/lnbits/extensions/nostradmin/models.py b/lnbits/extensions/nostradmin/models.py
index 1968567f..dc99b083 100644
--- a/lnbits/extensions/nostradmin/models.py
+++ b/lnbits/extensions/nostradmin/models.py
@@ -30,6 +30,7 @@ class nostrCreateConnections(BaseModel):
 class nostrRelays(BaseModel):
     id: Optional[str]
     relay: Optional[str]
+    status: Optional[bool] = False
 
 class nostrRelayList(BaseModel):
     id: str
diff --git a/lnbits/extensions/nostradmin/templates/nostradmin/index.html b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
index 27decdc8..57552bf2 100644
--- a/lnbits/extensions/nostradmin/templates/nostradmin/index.html
+++ b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
@@ -29,7 +29,7 @@
         <q-table
           flat
           dense
-          :data="nostrLinks"
+          :data="nostrrelayLinks"
           row-key="id"
           :columns="nostrTable.columns"
           :pagination.sync="nostrTable.pagination"
@@ -38,9 +38,6 @@
           {% raw %}
           <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
                 v-for="col in props.cols"
                 :key="col.name"
@@ -63,7 +60,12 @@
                 auto-width
               >
                 <div v-if="col.name == 'id'"></div>
-                <div v-else>{{ col.value }}</div>
+                <div v-else>
+                  <div v-if="col.value == true" style="background-color: green">
+                    {{ col.value }}
+                  </div>
+                  <div v-else>{{ col.value }}</div>
+                </div>
               </q-td>
             </q-tr>
           </template>
@@ -143,7 +145,7 @@
         <h6 class="text-subtitle1 q-my-none">{{SITE_TITLE}} Nostr Extension</h6>
         <p>Only Admin users can manage this extension</p>
 
-        <q-card-section>Okay </q-card-section>
+        <q-card-section></q-card-section>
       </q-card-section>
     </q-card>
   </div>
@@ -153,7 +155,7 @@
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
 
-  var maplnurldevice = obj => {
+  var maplrelays = obj => {
     obj._data = _.clone(obj)
     obj.theTime = obj.time * 60 - (Date.now() / 1000 - obj.timestamp)
     obj.time = obj.time + 'mins'
@@ -179,10 +181,16 @@
           allowlist: '',
           denylist: ''
         },
-        nostrLinks: [],
+        nostrrelayLinks: [],
         filter: '',
         nostrTable: {
           columns: [
+            {
+              name: 'wah',
+              align: 'left',
+              label: 'id',
+              field: 'id'
+            },
             {
               name: 'relay',
               align: 'left',
@@ -190,10 +198,10 @@
               field: 'relay'
             },
             {
-              name: 'connected',
+              name: 'status',
               align: 'left',
-              label: 'connected',
-              field: 'connected'
+              label: 'status',
+              field: 'status'
             }
           ],
           pagination: {
@@ -203,7 +211,7 @@
       }
     },
     methods: {
-      getrelays: function () {
+      getRelays: function () {
         var self = this
         LNbits.api
           .request(
@@ -213,7 +221,10 @@
           )
           .then(function (response) {
             if (response.data) {
-              self.nostrrelayLinks = response.data.map(maprelays)
+              console.log(response.data)
+              response.data.map(maplrelays)
+              self.nostrrelayLinks = response.data
+              console.log(self.nostrrelayLinks)
             }
           })
           .catch(function (error) {
@@ -284,7 +295,7 @@
     },
     created: function () {
       var self = this
-      this.getrelays()
+      this.getRelays()
       this.getLists()
     }
   })
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index f00c43a3..90d03eba 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -1,6 +1,5 @@
 from http import HTTPStatus
 import asyncio
-import asyncio
 from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
@@ -8,14 +7,17 @@ from fastapi.templating import Jinja2Templates
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
 from . import nostradmin_ext, nostr_renderer
+# FastAPI good for incoming
 from fastapi import Request, WebSocket, WebSocketDisconnect
+# Websockets needed for outgoing 
+import websockets
 
 from lnbits.core.crud import update_payment_status
 from lnbits.core.models import User
 from lnbits.core.views.api import api_payment
 from lnbits.decorators import check_user_exists
 
-from .crud import get_nostrkeys
+from .crud import get_nostrkeys, get_nostrrelay
 
 templates = Jinja2Templates(directory="templates")
 
@@ -74,8 +76,8 @@ class ConnectionManager:
 manager = ConnectionManager()
 
 
-@nostradmin_ext.websocket("/nostradmin/ws/{nostr_id}", name="nostr_id.websocket_by_id")
-async def websocket_endpoint(websocket: WebSocket, copilot_id: str):
+@nostradmin_ext.websocket("/nostradmin/ws/relayevents/{nostr_id}", name="nostr_id.websocket_by_id")
+async def websocket_endpoint(websocket: WebSocket, nostr_id: str):
     await manager.connect(websocket, nostr_id)
     try:
         while True:
@@ -88,4 +90,13 @@ async def updater(nostr_id, message):
     copilot = await get_copilot(nostr_id)
     if not copilot:
         return
-    await manager.send_personal_message(f"{message}", nostr_id)
\ No newline at end of file
+    await manager.send_personal_message(f"{message}", nostr_id)
+
+
+async def relay_check(relay: str):
+    async with websockets.connect(relay) as websocket:
+            if str(websocket.state) == "State.OPEN":
+                print(str(websocket.state))
+                return True
+            else:
+                return False
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
index ad8bcf17..4ff89704 100644
--- a/lnbits/extensions/nostradmin/views_api.py
+++ b/lnbits/extensions/nostradmin/views_api.py
@@ -24,11 +24,10 @@ from .crud import (
     get_nostrconnections,
 )
 from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
-
+from .views import relay_check
 
 @nostradmin_ext.get("/api/v1/relays")
 async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
-
     relays = await get_nostrrelays()
     if not relays:
         await create_nostrrelays(nostrCreateRelays(relay="wss://relayer.fiatjaf.com"))
@@ -36,10 +35,16 @@ async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
             nostrCreateRelays(relay="wss://nostr-pub.wellorder.net")
         )
         relays = await get_nostrrelays()
-    try:
-        return [{**relays.dict()} for relays in await relays]
-    except:
-        None
+    if not relays:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+    else:
+        for relay in relays:
+            relay.status = await relay_check(relay.relay)
+        return relays
+
+
 
 @nostradmin_ext.get("/api/v1/relaylist")
 async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):

From b565ec5d6cfcbfd2d509da8b84c28d9e66b733e1 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 10 Feb 2022 13:54:36 +0000
Subject: [PATCH 018/174] wdvds

---
 lnbits/extensions/diagonalley/__init__.py | 34 ++++++++++++++---------
 lnbits/extensions/diagonalley/config.json |  8 +++---
 lnbits/extensions/nostradmin/__init__.py  | 33 ++++++++++++++++++----
 lnbits/extensions/nostradmin/views.py     |  1 +
 4 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index 388c08db..dc7b0efb 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -1,28 +1,36 @@
 import asyncio
 
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 from fastapi.staticfiles import StaticFiles
 
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
 from lnbits.tasks import catch_everything_and_restart
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+from http import HTTPStatus
 
-db = Database("ext_diagonalley")
-
+from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
 
 diagonalley_ext: APIRouter = APIRouter(
     prefix="/diagonalley", tags=["diagonalley"]
 )
+db = Database("ext_diagonalley")
+if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
+    @diagonalley_ext.get("/", response_class=HTMLResponse)
+    async def index(request: Request):
+        return template_renderer().TemplateResponse(
+                "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
+            )
+else:
+    def diagonalley_renderer():
+        return template_renderer(["lnbits/extensions/diagonalley/templates"])
 
-def diagonalley_renderer():
-    return template_renderer(["lnbits/extensions/diagonalley/templates"])
+    from .tasks import wait_for_paid_invoices
+    from .views import *  # noqa
+    from .views_api import *  # noqa
 
 
-from .tasks import wait_for_paid_invoices
-from .views import *  # noqa
-from .views_api import *  # noqa
-
-
-def diagonalley_start():
-    loop = asyncio.get_event_loop()
-    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
\ No newline at end of file
+    def diagonalley_start():
+        loop = asyncio.get_event_loop()
+        loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
\ No newline at end of file
diff --git a/lnbits/extensions/diagonalley/config.json b/lnbits/extensions/diagonalley/config.json
index 99e92e9b..8ad41727 100644
--- a/lnbits/extensions/diagonalley/config.json
+++ b/lnbits/extensions/diagonalley/config.json
@@ -1,6 +1,6 @@
 {
-    "name": "Diagon Alley",
-    "short_description": "Movable anonymous market stand",
-    "icon": "add_shopping_cart",
-    "contributors": ["benarc","DeanH"]
+  "name": "Diagon Alley",
+  "short_description": "Nostr shop system",
+  "icon": "add_shopping_cart",
+  "contributors": ["benarc"]
 }
diff --git a/lnbits/extensions/nostradmin/__init__.py b/lnbits/extensions/nostradmin/__init__.py
index 797542c4..91586000 100644
--- a/lnbits/extensions/nostradmin/__init__.py
+++ b/lnbits/extensions/nostradmin/__init__.py
@@ -1,16 +1,37 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
 
-db = Database("ext_nostradmin")
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+from http import HTTPStatus
+
+from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
 
 nostradmin_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
 
+db = Database("ext_nostradmin")
+if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
+    @nostradmin_ext.get("/", response_class=HTMLResponse)
+    async def index(request: Request):
+        return template_renderer().TemplateResponse(
+                "error.html", {"request": request, "err": "NostrAdmin must be added to LNBITS_ADMIN_EXTENSIONS in .env"}
+            )
+else:
+    
+    def nostr_renderer():
+        return template_renderer(["lnbits/extensions/nostradmin/templates"])
+
+    from .views import *  # noqa
+    from .views_api import *  # noqa
+
+
+
+
+
+
+
 
-def nostr_renderer():
-    return template_renderer(["lnbits/extensions/nostradmin/templates"])
 
 
-from .views import *  # noqa
-from .views_api import *  # noqa
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 90d03eba..8e421abb 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -21,6 +21,7 @@ from .crud import get_nostrkeys, get_nostrrelay
 
 templates = Jinja2Templates(directory="templates")
 
+nostradmin = True
 
 @nostradmin_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):

From 17fa3399ff172a7683b3521dd4e9efd3f65fc2af Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Sat, 12 Feb 2022 12:40:12 +0000
Subject: [PATCH 019/174] blah

---
 .../templates/diagonalley/index.html          | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 6d6ea872..8f33fdcd 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -223,10 +223,10 @@
         </q-select>
         <div class="row">
           <div class="col-5">
-            <q-btn unelevated color="primary">Generate keys</q-btn>
+            <q-btn unelevated @onclick="generateKeys" color="primary">Generate keys</q-btn>
           </div>
           <div class="col-5">
-            <q-btn unelevated color="primary">Restore keys</q-btn>
+            <q-btn unelevated @onclick="restoreKeys" color="primary">Restore keys</q-btn>
           </div>
         </div>
         <q-input
@@ -301,7 +301,7 @@
     <q-card>
       <q-card-section>
       
-        <q-btn unelevated v-if="stalls.length > 1" color="primary" @click="productDialog.show = true"
+        <q-btn unelevated v-if="stalls.length > 0" color="primary" @click="productDialog.show = true"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
@@ -310,7 +310,7 @@
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated v-if="zones.length > 1" color="primary" @click="openStallDialog()"
+        <q-btn unelevated v-if="zones.length > 0" color="primary" @click="openStallDialog()"
           >+ Stall
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
@@ -665,6 +665,10 @@ var mapOrders = obj => {
   obj._data = _.clone(obj)
   return obj
 }
+var mapKeys = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
 
 new Vue({
   el: '#vue',
@@ -911,6 +915,26 @@ new Vue({
     }
   },
   methods: {
+    generateKeys: function(){
+      var self = this
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/keys',
+          self.g.user.wallets[0].adminkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.keys = response.data.map(mapKeys)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    restoreKeys: function(){
+      
+    },
     capitalizeFirstLetter: function (string) {
       return string.charAt(0).toUpperCase() + string.slice(1);
     },

From 14b95d3ba07391fddf6a150af20048a2120f03b8 Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Thu, 17 Feb 2022 23:17:44 +0000
Subject: [PATCH 020/174] Fusion44s relay_manager added to nostradmin

---
 lnbits/extensions/nostradmin/relay_manager.py | 105 ++++++++++++++++++
 lnbits/extensions/nostradmin/views.py         |  25 +++--
 2 files changed, 121 insertions(+), 9 deletions(-)
 create mode 100644 lnbits/extensions/nostradmin/relay_manager.py

diff --git a/lnbits/extensions/nostradmin/relay_manager.py b/lnbits/extensions/nostradmin/relay_manager.py
new file mode 100644
index 00000000..cc880ad8
--- /dev/null
+++ b/lnbits/extensions/nostradmin/relay_manager.py
@@ -0,0 +1,105 @@
+import asyncio
+import logging
+from typing import Any, Dict
+
+import websockets
+
+
+# Many thanks to Fusion44 for https://gist.github.com/fusion44/9af0b054b4609012752b0c8c1dafbd4a
+
+class Relay:
+    url: str
+    read: bool
+    write: bool
+    active: bool
+    _connection: Any
+
+    def __init__(self, url: str, read: bool, write: bool, active: bool) -> None:
+        self.url = url
+        self.read = read
+        self.write = write
+        self.active = active
+
+    async def connect(self):
+        self._connection = await websockets.connect(self.url)
+
+    async def send(self, message):
+        if not self.write or not self.active:
+            raise RuntimeError("Can't send to a relay that is inactive or not writable")
+        await self._connection.send(message)
+
+    async def listen(self):
+        if not self.read or not self.active:
+            raise RuntimeError(
+                "Can't listen to a relay that is inactive or not readable"
+            )
+
+        while True:
+            try:
+                msg = await self._connection.recv()
+                yield msg
+            except websockets.ConnectionClosedOK:
+                break
+
+
+class RelayManager:
+    _relays: Dict[str, Relay] = {}
+    _tasks: Dict[str, asyncio.Task] = {}
+    msg_channel = asyncio.Queue()
+
+    def __init__(self, enable_ws_debugger=False) -> None:
+        if enable_ws_debugger:
+            logger = logging.getLogger("websockets")
+            logger.setLevel(logging.DEBUG)
+            logger.addHandler(logging.StreamHandler())
+        pass
+
+    async def add_relay(self, relay: Relay):
+        if relay.url in self._relays.keys():
+            raise RuntimeError(f"Relay {relay.url} exists")
+
+        if relay.active and relay.read:
+            await relay.connect()
+            loop = asyncio.get_event_loop()
+            t = loop.create_task(self._relay_listener(relay, self.msg_channel))
+            self._tasks[relay.url] = t
+
+        self._relays[relay.url] = relay
+
+    async def remove_relay(self, url: str):
+        if url in self._relays.keys():
+            relay = self._relays[url]
+            if relay.active:
+                t = self._tasks[url]
+                t.cancel()
+                try:
+                    await t
+                except asyncio.CancelledError:
+                    print(f"Canceled task {relay.url}")
+
+    def get_relay(self, url: str) -> Relay:
+        if not url in self._relays.keys():
+            raise RuntimeError("Relay not found")
+        return self._relays.get(url)
+
+    async def update_relay(self, relay: Relay):
+        if relay.url in self._relays.keys():
+            # remove the old relay
+            await self.remove_relay(relay.url)
+
+            # add the new relay
+            await self.add_relay(relay)
+        else:
+            raise RuntimeError("Unknown Relay")
+
+    async def send_to_all(self, message):
+        for r in self._relays.values():
+            if r.write:
+                await r.send(message=message)
+
+    async def _relay_listener(self, relay: Relay, msg_chan: asyncio.Queue):
+        print(f"listening for {relay.url}")
+        async for msg in relay.listen():
+            print(msg)
+            msg_chan.put_nowait(msg)
+        print(f"STOP listening for {relay.url}")
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 8e421abb..705feba7 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -18,6 +18,7 @@ from lnbits.core.views.api import api_payment
 from lnbits.decorators import check_user_exists
 
 from .crud import get_nostrkeys, get_nostrrelay
+from .relay_manager import RelayManager, Relay
 
 templates = Jinja2Templates(directory="templates")
 
@@ -38,15 +39,17 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 websocket_queue = asyncio.Queue(1000)
 
-# while True:
-async def nostr_subscribe():
-    return
-    # for the relays:
-    # async with websockets.connect("ws://localhost:8765") as websocket:
-    # for the public keys:
-    # await websocket.send("subscribe to events")
-    # await websocket.recv()
 
+mgr: RelayManager = RelayManager(enable_ws_debugger=False)
+
+# listen for events coming from relays
+
+
+async def connectToNostr():
+    while True:
+        e = await mgr.msg_channel.get()
+        print(e)
+connectToNostr
 #####################################################################
 ################### LNBITS WEBSOCKET ROUTES #########################
 #### HERE IS WHERE LNBITS FRONTEND CAN RECEIVE AND SEND MESSAGES ####
@@ -97,7 +100,11 @@ async def updater(nostr_id, message):
 async def relay_check(relay: str):
     async with websockets.connect(relay) as websocket:
             if str(websocket.state) == "State.OPEN":
-                print(str(websocket.state))
+                r = Relay(url=relay, read=True, write=True, active=True)
+                try:
+                    await mgr.add_relay(r)
+                except:
+                    None
                 return True
             else:
                 return False
\ No newline at end of file

From f72ec97b37b07a66367f8027e4b32edf296903d7 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 11 Jul 2022 21:38:05 +0100
Subject: [PATCH 021/174] remove nostrAdmin check

---
 lnbits/extensions/diagonalley/__init__.py | 39 +++++++++++------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index dc7b0efb..6b082a5d 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -1,36 +1,35 @@
 import asyncio
+from http import HTTPStatus
 
 from fastapi import APIRouter, Request
 from fastapi.staticfiles import StaticFiles
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
 
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
-from lnbits.tasks import catch_everything_and_restart
-from starlette.exceptions import HTTPException
-from starlette.responses import HTMLResponse
-from http import HTTPStatus
-
 from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
+from lnbits.tasks import catch_everything_and_restart
 
 diagonalley_ext: APIRouter = APIRouter(
     prefix="/diagonalley", tags=["diagonalley"]
 )
 db = Database("ext_diagonalley")
-if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
-    @diagonalley_ext.get("/", response_class=HTMLResponse)
-    async def index(request: Request):
-        return template_renderer().TemplateResponse(
-                "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
-            )
-else:
-    def diagonalley_renderer():
-        return template_renderer(["lnbits/extensions/diagonalley/templates"])
+# if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
+#     @diagonalley_ext.get("/", response_class=HTMLResponse)
+#     async def index(request: Request):
+#         return template_renderer().TemplateResponse(
+#                 "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
+#             )
+# else:
+def diagonalley_renderer():
+    return template_renderer(["lnbits/extensions/diagonalley/templates"])
 
-    from .tasks import wait_for_paid_invoices
-    from .views import *  # noqa
-    from .views_api import *  # noqa
+from .tasks import wait_for_paid_invoices
+from .views import *  # noqa
+from .views_api import *  # noqa
 
 
-    def diagonalley_start():
-        loop = asyncio.get_event_loop()
-        loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
\ No newline at end of file
+def diagonalley_start():
+    loop = asyncio.get_event_loop()
+    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))

From 89181eb74ef2bb3a6448b02bb79bc38070bfc6c0 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 11:01:15 +0100
Subject: [PATCH 022/174] add timespamp on orders, nullable nostr,user keyword

---
 lnbits/extensions/diagonalley/crud.py       |  4 ++--
 lnbits/extensions/diagonalley/migrations.py | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index d2df427c..cebb5c0b 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -102,7 +102,7 @@ async def create_diagonalley_zone(
         f"""
         INSERT INTO diagonalley.zones (
             id,
-            user,
+            "user",
             cost,
             countries
 
@@ -133,7 +133,7 @@ async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
 
 
 async def get_diagonalley_zones(user: str) -> List[Zones]:
-    rows = await db.fetchall("SELECT * FROM diagonalley.zones WHERE user = ?", (user,))
+    rows = await db.fetchall('SELECT * FROM diagonalley.zones WHERE "user" = ?', (user,))
     return [Zones(**row) for row in rows]
 
 
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 29a84419..11cd2d11 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -26,9 +26,9 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
-            publickey TEXT NOT NULL,
-            privatekey TEXT NOT NULL,
-            relays TEXT NOT NULL,
+            publickey TEXT,
+            privatekey TEXT,
+            relays TEXT,
             shippingzones TEXT NOT NULL
         );
     """
@@ -41,7 +41,7 @@ async def m001_initial(db):
         """
         CREATE TABLE diagonalley.zones (
             id TEXT PRIMARY KEY,
-            user TEXT NOT NULL,
+            "user" TEXT NOT NULL,
             cost TEXT NOT NULL,
             countries TEXT NOT NULL
         );
@@ -65,7 +65,10 @@ async def m001_initial(db):
             email TEXT NOT NULL,
             invoiceid TEXT NOT NULL,
             paid BOOLEAN NOT NULL,
-            shipped BOOLEAN NOT NULL
+            shipped BOOLEAN NOT NULL,
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )

From 4deb116076d982829a44484824b303d81aaa1fa2 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 11:02:12 +0100
Subject: [PATCH 023/174] clean up optional nostr,timestamp

---
 lnbits/extensions/diagonalley/models.py | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 743c2068..0d42c279 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -1,32 +1,24 @@
-import json
-from lib2to3.pytree import Base
-from sqlite3 import Row
-from typing import Dict, Optional
-from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+from typing import Optional
 
 from fastapi.param_functions import Query
-from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
-from starlette.requests import Request
-
-from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class Stalls(BaseModel):
     id: str
     wallet: str
     name: str
-    publickey: str
-    privatekey: str
-    relays: str
+    publickey: Optional[str]
+    privatekey: Optional[str]
+    relays: Optional[str]
     shippingzones: str
 
 class createStalls(BaseModel):
     wallet: str = Query(...)
     name: str = Query(...)
-    publickey: str = Query(...)
-    privatekey: str = Query(...)
-    relays: str = Query(...)
+    publickey: str = Query(None)
+    privatekey: str = Query(None)
+    relays: str = Query(None)
     shippingzones: str = Query(...)
 
 class createProduct(BaseModel):
@@ -50,7 +42,7 @@ class Products(BaseModel):
 
 class createZones(BaseModel):
     cost: int = Query(0, ge=0)
-    countries: str = Query(None)
+    countries: str = Query(...)
 
 class Zones(BaseModel):
     id: str
@@ -82,3 +74,4 @@ class Orders(BaseModel):
     invoiceid: str
     paid: bool
     shipped: bool
+    time: int

From fd280aee1a23bd2afa847fc74259b34d0c8ca9d2 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 11:02:27 +0100
Subject: [PATCH 024/174] create and display zones

---
 lnbits/extensions/diagonalley/templates/diagonalley/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 8f33fdcd..73a5c975 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -685,6 +685,8 @@ new Vue({
       customerMessages: {},
       shippedModel: false,
       shippingZoneOptions: [
+        'Worldwide',
+        'Europe',
         'Australia',
         'Austria',
         'Belgium',

From 4fde09e0cc5f8ab66f9604efccdf6dd8fc07cbab Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 15:07:56 +0100
Subject: [PATCH 025/174] stalls/stores create update with human readable zones

---
 lnbits/extensions/diagonalley/crud.py         |  2 +-
 .../templates/diagonalley/index.html          | 79 +++++++++++--------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index cebb5c0b..12cc611f 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -168,7 +168,7 @@ async def create_diagonalley_stall(
             data.publickey,
             data.privatekey,
             data.relays,
-            repr(data.shippingzones)),
+            data.shippingzones),
     )
 
     stall = await get_diagonalley_stall(stall_id)
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 73a5c975..b2ab5f9d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -221,7 +221,8 @@
           label="Wallet *"
         >
         </q-select>
-        <div class="row">
+        <!-- NOSTR -->
+        <!-- <div class="row">
           <div class="col-5">
             <q-btn unelevated @onclick="generateKeys" color="primary">Generate keys</q-btn>
           </div>
@@ -242,7 +243,7 @@
           dense
           v-model.trim="stallDialog.data.privatekey"
           label="Private Key"
-        ></q-input>
+        ></q-input> -->
         <q-select
           :options="zoneOptions"
           filled
@@ -251,7 +252,8 @@
           v-model.trim="stallDialog.data.shippingzones"
           label="Shipping Zones"
         ></q-select>
-        <q-select
+        <!-- NOSTR -->
+        <!-- <q-select
           :options="relayOptions"
           filled
           dense
@@ -271,23 +273,24 @@
           dense
           v-model.trim="stallDialog.data.nostrShops"
           label="Nostr shop public keys (seperate by comma)"
-        ></q-input>
+        ></q-input> -->
+        <p><strong><small>Nostr support coming soon!</small></strong></p>
         <div class="row q-mt-lg">
           <q-btn
             v-if="stallDialog.data.id"
             unelevated
             color="primary"
             type="submit"
-            >Update Stall</q-btn
+            >Update Store</q-btn
           >
           <q-btn
             v-else
             unelevated
             color="primary"
-            :disable="stallDialog.data.countries == null
-              || stallDialog.data.cost == null"
+            :disable="stallDialog.data.wallet == null
+              || stallDialog.data.shippingzones == null"
             type="submit"
-            >Create Stall</q-btn
+            >Create Store</q-btn
           >
           <q-btn v-close-popup flat color="grey" class="q-ml-auto"
             >Cancel</q-btn
@@ -311,11 +314,11 @@
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
         <q-btn unelevated v-if="zones.length > 0" color="primary" @click="openStallDialog()"
-          >+ Stall
+          >+ Store
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s).')"
-          >+ Stall
+          >+ Store
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="shopDialog.show = true"
@@ -469,12 +472,12 @@
         </q-table>
       </q-card-section>
     </q-card>
-
+    <!-- STORES -->
     <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">Stalls</h5>
+            <h5 class="text-subtitle1 q-my-none">Stores</h5>
           </div>
           <div class="col-auto">
             <q-btn flat color="grey" @click="exportStallsCSV"
@@ -528,7 +531,7 @@
         </q-table>
       </q-card-section>
     </q-card>
-
+    <!-- ZONES -->
     <q-card>
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
@@ -964,7 +967,7 @@ new Vue({
       LNbits.api
         .request(
           'GET',
-          '/diagonalley/api/v1/stalls?all_wallets',
+          '/diagonalley/api/v1/stalls?all_wallets=true',
           self.g.user.wallets[0].adminkey
         )
         .then(function (response) {
@@ -977,49 +980,59 @@ new Vue({
           })
     },
     openStallDialog: function () {
-      console.log(this.zones[0]['id'])
-      for(let i = 0; i < this.zones.length; i ++){
-        this.zoneOptions.push(this.zones[i]['id'])
-      }
+      this.zoneOptions = this.zones.map(z => `${z.id} - ${z.countries}`)
+      //console.log(this.zones[0]['id'])
+      //for(let i = 0; i < this.zones.length; i ++){
+      //  this.zoneOptions.push(this.zones[i]['id'])
+      //}
       this.stallDialog.show = true
     },
     openStallUpdateDialog: function (linkId) {
       var self = this
       var link = _.findWhere(self.stalls, {id: linkId})
-      for(let i = 0; i < this.zones.length; i ++){
-        this.zoneOptions.push(this.stalls[i][0])
-      }
+      this.zoneOptions = this.zones.map(z => `${z.id} - ${z.countries}`)
+      //for(let i = 0; i < this.zones.length; i ++){
+      //  this.zoneOptions.push(this.stalls[i][0])
+      //}
       this.stallDialog.data = _.clone(link._data)
+      let shippingzones = this.zoneOptions.filter(z => this.stallDialog.data.shippingzones.split(",").includes(z.split("-")[0].trim()))
+        
+      this.stallDialog.data.shippingzones = shippingzones//this.stallDialog.data.shippingzones.split(",")
+
+      console.log(this.stallDialog.data)
+      //let zones = this.zoneOptions
+      //  .filter(z => z.id == )
       this.stallDialog.show = true
     },
     sendStallFormData: function () {
-      if (this.stallDialog.data.id) {
-      } else {
-        var data = {
-          name: this.stallDialog.data.name,
-          wallet: this.stallDialog.data.wallet,
-          publickey: this.stallDialog.data.publickey,
-          privatekey: this.stallDialog.data.privatekey,
-          relays: this.stallDialog.data.relays
-        }
+      let data = {
+        name: this.stallDialog.data.name,
+        wallet: this.stallDialog.data.wallet,
+        publickey: this.stallDialog.data.publickey,
+        privatekey: this.stallDialog.data.privatekey,
+        relays: this.stallDialog.data.relays,
+        shippingzones: this.stallDialog.data.shippingzones
+          .map(z => z.split("-")[0].trim())
+          .toString()
       }
-
       if (this.stallDialog.data.id) {
+        this.stallDialog.data = {...this.stallDialog.data, ...data}
         this.updateStall(this.stallDialog.data)
       } else {
         this.createStall(data)
       }
     },
     updateStall: function (data) {
+      console.log(data)
       var self = this
       LNbits.api
         .request(
           'PUT',
-          '/diagonalley/api/v1/stalls' + data.id,
+          '/diagonalley/api/v1/stalls/' + data.id,
           _.findWhere(self.g.user.wallets, {
             id: self.stallDialog.data.wallet
           }).inkey,
-          _.pick(data, 'name', 'wallet', 'publickey', 'privatekey')
+          data
         )
         .then(function (response) {
           self.stalls = _.reject(self.stalls, function (obj) {

From 2fed92e69aa8092fba0c099dda8f08a825040270 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 15:25:25 +0100
Subject: [PATCH 026/174] black'ed

---
 lnbits/extensions/diagonalley/__init__.py  |   5 +-
 lnbits/extensions/diagonalley/crud.py      |  25 ++--
 lnbits/extensions/diagonalley/models.py    |   6 +
 lnbits/extensions/diagonalley/views.py     |  11 +-
 lnbits/extensions/diagonalley/views_api.py | 132 +++++++++++++--------
 5 files changed, 106 insertions(+), 73 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index 6b082a5d..db88bdbd 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -11,9 +11,7 @@ from lnbits.helpers import template_renderer
 from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
 from lnbits.tasks import catch_everything_and_restart
 
-diagonalley_ext: APIRouter = APIRouter(
-    prefix="/diagonalley", tags=["diagonalley"]
-)
+diagonalley_ext: APIRouter = APIRouter(prefix="/diagonalley", tags=["diagonalley"])
 db = Database("ext_diagonalley")
 # if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
 #     @diagonalley_ext.get("/", response_class=HTMLResponse)
@@ -25,6 +23,7 @@ db = Database("ext_diagonalley")
 def diagonalley_renderer():
     return template_renderer(["lnbits/extensions/diagonalley/templates"])
 
+
 from .tasks import wait_for_paid_invoices
 from .views import *  # noqa
 from .views_api import *  # noqa
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 12cc611f..fec2778c 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -24,9 +24,8 @@ from .models import (
 
 ###Products
 
-async def create_diagonalley_product(
-    data: createProduct
-) -> Products:
+
+async def create_diagonalley_product(data: createProduct) -> Products:
     product_id = urlsafe_short_hash()
     await db.execute(
         f"""
@@ -93,10 +92,7 @@ async def delete_diagonalley_product(product_id: str) -> None:
 ###zones
 
 
-async def create_diagonalley_zone(
-    user,
-    data: createZones
-) -> Zones:
+async def create_diagonalley_zone(user, data: createZones) -> Zones:
     zone_id = urlsafe_short_hash()
     await db.execute(
         f"""
@@ -133,7 +129,9 @@ async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
 
 
 async def get_diagonalley_zones(user: str) -> List[Zones]:
-    rows = await db.fetchall('SELECT * FROM diagonalley.zones WHERE "user" = ?', (user,))
+    rows = await db.fetchall(
+        'SELECT * FROM diagonalley.zones WHERE "user" = ?', (user,)
+    )
     return [Zones(**row) for row in rows]
 
 
@@ -144,9 +142,7 @@ async def delete_diagonalley_zone(zone_id: str) -> None:
 ###Stalls
 
 
-async def create_diagonalley_stall(
-    data: createStalls
-) -> Stalls:
+async def create_diagonalley_stall(data: createStalls) -> Stalls:
     stall_id = urlsafe_short_hash()
     await db.execute(
         f"""
@@ -168,7 +164,8 @@ async def create_diagonalley_stall(
             data.publickey,
             data.privatekey,
             data.relays,
-            data.shippingzones),
+            data.shippingzones,
+        ),
     )
 
     stall = await get_diagonalley_stall(stall_id)
@@ -210,9 +207,7 @@ async def delete_diagonalley_stall(stall_id: str) -> None:
 ###Orders
 
 
-async def create_diagonalley_order(
-    data: createOrder
-) -> Orders:
+async def create_diagonalley_order(data: createOrder) -> Orders:
 
     order_id = urlsafe_short_hash()
     await db.execute(
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 0d42c279..5b0f3d5c 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -13,6 +13,7 @@ class Stalls(BaseModel):
     relays: Optional[str]
     shippingzones: str
 
+
 class createStalls(BaseModel):
     wallet: str = Query(...)
     name: str = Query(...)
@@ -21,6 +22,7 @@ class createStalls(BaseModel):
     relays: str = Query(None)
     shippingzones: str = Query(...)
 
+
 class createProduct(BaseModel):
     stall: str = Query(None)
     product: str = Query(None)
@@ -30,6 +32,7 @@ class createProduct(BaseModel):
     price: int = Query(0, ge=0)
     quantity: int = Query(0, ge=0)
 
+
 class Products(BaseModel):
     id: str
     stall: str
@@ -40,10 +43,12 @@ class Products(BaseModel):
     price: int
     quantity: int
 
+
 class createZones(BaseModel):
     cost: int = Query(0, ge=0)
     countries: str = Query(...)
 
+
 class Zones(BaseModel):
     id: str
     user: str
@@ -61,6 +66,7 @@ class createOrder(BaseModel):
     email: str = Query(...)
     invoiceid: str = Query(...)
 
+
 class Orders(BaseModel):
     id: str
     productid: str
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index ae0899ca..c38f8d51 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -1,4 +1,3 @@
-
 from http import HTTPStatus
 
 from fastapi import Request
@@ -15,21 +14,27 @@ from .crud import get_diagonalley_products
 
 templates = Jinja2Templates(directory="templates")
 
+
 @diagonalley_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/index.html", {"request": request, "user": user.dict()}
     )
 
+
 @diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
     product = await get_diagonalley_products(stall_id)
-    
+
     if not product:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
         )
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
-        {"stall": [product.dict() for product in await get_diagonalley_products(stall_id)]}
+        {
+            "stall": [
+                product.dict() for product in await get_diagonalley_products(stall_id)
+            ]
+        },
     )
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 6363dc97..c91eecf5 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -65,36 +65,35 @@ async def api_copilot_retrieve(
     return {**copilot.dict(), **{"lnurl": copilot.lnurl(req)}}
 """
 
+
 @diagonalley_ext.get("/api/v1/products")
 async def api_diagonalley_products(
     req: Request,
     wallet: WalletTypeInfo = Depends(get_key_type),
-    all_stalls: bool = Query(False)
+    all_stalls: bool = Query(False),
 ):
     wallet_ids = [wallet.wallet.id]
 
     if all_stalls:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([product.dict() for product in await get_diagonalley_products(wallet_ids)])
+    return [product.dict() for product in await get_diagonalley_products(wallet_ids)]
 
 
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
-    product_id, 
-    data: createProduct, 
-    wallet: WalletTypeInfo = Depends(get_key_type)
-    ):
+    product_id, data: createProduct, wallet: WalletTypeInfo = Depends(get_key_type)
+):
 
     if product_id:
         product = await get_diagonalley_product(product_id)
 
         if not product:
-            return ({"message": "Withdraw product does not exist."})
+            return {"message": "Withdraw product does not exist."}
 
         if product.wallet != wallet.wallet.id:
-            return ({"message": "Not your withdraw product."})
+            return {"message": "Not your withdraw product."}
 
         product = await update_diagonalley_product(product_id, **data.dict())
     else:
@@ -104,14 +103,16 @@ async def api_diagonalley_product_create(
 
 
 @diagonalley_ext.delete("/api/v1/products/{product_id}")
-async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_products_delete(
+    product_id, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     product = await get_diagonalley_product(product_id)
 
     if not product:
-        return ({"message": "Product does not exist."})
+        return {"message": "Product does not exist."}
 
     if product.wallet != wallet.wallet.id:
-        return ({"message": "Not your Diagon Alley."})
+        return {"message": "Not your Diagon Alley."}
 
     await delete_diagonalley_product(product_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
@@ -125,38 +126,41 @@ async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
 
     return await get_diagonalley_zones(wallet.wallet.user)
 
+
 @diagonalley_ext.post("/api/v1/zones")
 async def api_diagonalley_zone_create(
-    data: createZones, 
-    wallet: WalletTypeInfo = Depends(get_key_type)
-    ):
+    data: createZones, wallet: WalletTypeInfo = Depends(get_key_type)
+):
     zone = await create_diagonalley_zone(user=wallet.wallet.user, data=data)
     return zone.dict()
 
+
 @diagonalley_ext.post("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_update(
-    data: createZones, 
-    zone_id: str = Query(None),  
-    wallet: WalletTypeInfo = Depends(require_admin_key)
-    ):
+    data: createZones,
+    zone_id: str = Query(None),
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+):
     zone = await get_diagonalley_zone(zone_id)
     if not zone:
-        return ({"message": "Zone does not exist."})
+        return {"message": "Zone does not exist."}
     if zone.user != wallet.wallet.user:
-        return ({"message": "Not your record."})
+        return {"message": "Not your record."}
     zone = await update_diagonalley_zone(zone_id, **data.dict())
     return zone
 
 
 @diagonalley_ext.delete("/api/v1/zones/{zone_id}")
-async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_zone_delete(
+    zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     zone = await get_diagonalley_zone(zone_id)
 
     if not zone:
-        return ({"message": "zone does not exist."})
+        return {"message": "zone does not exist."}
 
     if zone.user != wallet.wallet.user:
-        return ({"message": "Not your zone."})
+        return {"message": "Not your zone."}
 
     await delete_diagonalley_zone(zone_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
@@ -166,27 +170,33 @@ async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(
 
 
 @diagonalley_ext.get("/api/v1/stalls")
-async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
+async def api_diagonalley_stalls(
+    wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
+):
     wallet_ids = [wallet.wallet.id]
 
     if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([stall.dict() for stall in await get_diagonalley_stalls(wallet_ids)])
+    return [stall.dict() for stall in await get_diagonalley_stalls(wallet_ids)]
 
 
 @diagonalley_ext.post("/api/v1/stalls")
 @diagonalley_ext.put("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_create(
+    data: createStalls,
+    stall_id: str = Query(None),
+    wallet: WalletTypeInfo = Depends(get_key_type),
+):
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
 
         if not stall:
-            return ({"message": "Withdraw stall does not exist."})
+            return {"message": "Withdraw stall does not exist."}
 
         if stall.wallet != wallet.wallet.id:
-            return ({"message": "Not your withdraw stall."})
+            return {"message": "Not your withdraw stall."}
 
         stall = await update_diagonalley_stall(stall_id, **data.dict())
     else:
@@ -196,14 +206,16 @@ async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query
 
 
 @diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_stall_delete(
+    stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     stall = await get_diagonalley_stall(stall_id)
 
     if not stall:
-        return ({"message": "Stall does not exist."})
+        return {"message": "Stall does not exist."}
 
     if stall.wallet != wallet.wallet.id:
-        return ({"message": "Not your Stall."})
+        return {"message": "Not your Stall."}
 
     await delete_diagonalley_stall(stall_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
@@ -213,33 +225,39 @@ async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: Wall
 
 
 @diagonalley_ext.get("/api/v1/orders")
-async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
+async def api_diagonalley_orders(
+    wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
+):
     wallet_ids = [wallet.wallet.id]
 
     if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
     try:
-        return ([order.dict() for order in await get_diagonalley_orders(wallet_ids)])
+        return [order.dict() for order in await get_diagonalley_orders(wallet_ids)]
     except:
-        return ({"message": "We could not retrieve the orders."})
+        return {"message": "We could not retrieve the orders."}
 
 
 @diagonalley_ext.post("/api/v1/orders")
-async def api_diagonalley_order_create(data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_order_create(
+    data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
+):
     order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
     return order.dict()
 
 
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
-async def api_diagonalley_order_delete(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_order_delete(
+    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+):
     order = await get_diagonalley_order(order_id)
 
     if not order:
-        return ({"message": "Order does not exist."})
+        return {"message": "Order does not exist."}
 
     if order.wallet != wallet.wallet.id:
-        return ({"message": "Not your Order."})
+        return {"message": "Not your Order."}
 
     await delete_diagonalley_order(order_id)
 
@@ -247,7 +265,9 @@ async def api_diagonalley_order_delete(order_id: str = Query(None), wallet: Wall
 
 
 @diagonalley_ext.get("/api/v1/orders/paid/{order_id}")
-async def api_diagonalley_order_paid(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_order_paid(
+    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     await db.execute(
         "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
         (
@@ -259,7 +279,9 @@ async def api_diagonalley_order_paid(order_id: str = Query(None), wallet: Wallet
 
 
 @diagonalley_ext.get("/api/v1/orders/shipped/{order_id}")
-async def api_diagonalley_order_shipped(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_order_shipped(
+    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+):
     await db.execute(
         "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
         (
@@ -271,54 +293,60 @@ async def api_diagonalley_order_shipped(order_id: str = Query(None), wallet: Wal
         "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
     )
 
-    return ([order.dict() for order in get_diagonalley_orders(order["wallet"])])
+    return [order.dict() for order in get_diagonalley_orders(order["wallet"])]
 
 
 ###List products based on stall id
 
 
 @diagonalley_ext.get("/api/v1/stall/products/{stall_id}")
-async def api_diagonalley_stall_products(stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_products(
+    stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+):
 
     rows = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
     print(rows[1])
     if not rows:
-        return ({"message": "Stall does not exist."})
+        return {"message": "Stall does not exist."}
 
     products = db.fetchone(
         "SELECT * FROM diagonalley.products WHERE wallet = ?", (rows[1],)
     )
     if not products:
-        return ({"message": "No products"})
+        return {"message": "No products"}
 
-    return ([products.dict() for products in await get_diagonalley_products(rows[1])])
+    return [products.dict() for products in await get_diagonalley_products(rows[1])]
 
 
 ###Check a product has been shipped
 
 
 @diagonalley_ext.get("/api/v1/stall/checkshipped/{checking_id}")
-async def api_diagonalley_stall_checkshipped(checking_id, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_checkshipped(
+    checking_id, wallet: WalletTypeInfo = Depends(get_key_type)
+):
     rows = await db.fetchone(
         "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
     )
-    return ({"shipped": rows["shipped"]})
+    return {"shipped": rows["shipped"]}
 
 
 ###Place order
 
 
 @diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
-async def api_diagonalley_stall_order(stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_order(
+    stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
+):
     product = await get_diagonalley_product(data.productid)
     shipping = await get_diagonalley_stall(stall_id)
 
     if data.shippingzone == 1:
-        shippingcost = shipping.zone1cost #missing in model
+        shippingcost = shipping.zone1cost  # missing in model
     else:
-        shippingcost = shipping.zone2cost #missing in model
+        shippingcost = shipping.zone2cost  # missing in model
 
     checking_id, payment_request = await create_invoice(
         wallet_id=product.wallet,
@@ -334,7 +362,7 @@ async def api_diagonalley_stall_order(stall_id, data: createOrder, wallet: Walle
         (
             selling_id,
             data.productid,
-            product.wallet, #doesn't exist in model
+            product.wallet,  # doesn't exist in model
             product.product,
             data.quantity,
             data.shippingzone,
@@ -345,4 +373,4 @@ async def api_diagonalley_stall_order(stall_id, data: createOrder, wallet: Walle
             False,
         ),
     )
-    return ({"checking_id": checking_id, "payment_request": payment_request})
+    return {"checking_id": checking_id, "payment_request": payment_request}

From b11597b0de491dbad819d2d9433c89acace20cd6 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 15:29:46 +0100
Subject: [PATCH 027/174] fix create edit delete permissions

---
 .../diagonalley/templates/diagonalley/index.html         | 2 +-
 lnbits/extensions/diagonalley/views_api.py               | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index b2ab5f9d..d7660bc9 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1079,7 +1079,7 @@ new Vue({
             .request(
               'DELETE',
               '/diagonalley/api/v1/stalls/' + stallId,
-              _.findWhere(self.g.user.wallets, {id: stall.wallet}).inkey
+              _.findWhere(self.g.user.wallets, {id: stall.wallet}).adminkey
             )
             .then(function (response) {
               self.stalls = _.reject(self.stalls, function (obj) {
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index c91eecf5..06a854f0 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -9,7 +9,12 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
-from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
+from lnbits.decorators import (
+    WalletTypeInfo,
+    get_key_type,
+    require_admin_key,
+    require_invoice_key,
+)
 
 from . import db, diagonalley_ext
 from .crud import (
@@ -186,7 +191,7 @@ async def api_diagonalley_stalls(
 async def api_diagonalley_stall_create(
     data: createStalls,
     stall_id: str = Query(None),
-    wallet: WalletTypeInfo = Depends(get_key_type),
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
 
     if stall_id:

From c19618eddc3dd09d86aed84d03f874a564ccd440 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 17:22:03 +0100
Subject: [PATCH 028/174] create product

---
 lnbits/extensions/diagonalley/crud.py         | 11 +--
 lnbits/extensions/diagonalley/models.py       |  2 +-
 .../templates/diagonalley/index.html          | 69 ++++++++++---------
 lnbits/extensions/diagonalley/views_api.py    |  7 +-
 4 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index fec2778c..117a2379 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -70,18 +70,19 @@ async def get_diagonalley_product(product_id: str) -> Optional[Products]:
     return Products(**row) if row else None
 
 
-async def get_diagonalley_products(wallet_ids: Union[str, List[str]]) -> List[Products]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
+async def get_diagonalley_products(stall_ids: Union[str, List[str]]) -> List[Products]:
+    if isinstance(stall_ids, str):
+        stall_ids = [stall_ids]
 
     # with open_ext_db("diagonalley") as db:
-    q = ",".join(["?"] * len(wallet_ids))
+    q = ",".join(["?"] * len(stall_ids))
     rows = await db.fetchall(
         f"""
         SELECT * FROM diagonalley.products WHERE stall IN ({q})
         """,
-        (*wallet_ids,),
+        (*stall_ids,),
     )
+    print("PRODS", rows)
     return [Products(**row) for row in rows]
 
 
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 5b0f3d5c..9557f6e9 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -24,7 +24,7 @@ class createStalls(BaseModel):
 
 
 class createProduct(BaseModel):
-    stall: str = Query(None)
+    stall: str = Query(...)
     product: str = Query(None)
     categories: str = Query(None)
     description: str = Query(None)
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index d7660bc9..a804898d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -9,7 +9,7 @@
           dense
           emit-value
           v-model="productDialog.data.stall"
-          :options="stalls"
+          :options="stalls.map(s => ({label: s.name, value: s.id}))"
           label="Stall"
         >
         </q-select>
@@ -100,7 +100,7 @@
             v-else
             unelevated
             color="primary"
-            :disable="productDialog.data.image == null
+            :disable="productDialog.data.price == null
               || productDialog.data.product == null
               || productDialog.data.description == null
               || productDialog.data.quantity == null"
@@ -645,34 +645,38 @@
 </div>
 </div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-
+<script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
 <script>
 
 Vue.component(VueQrcode.name, VueQrcode)
 
-//const pica = window.pica()
+const pica = window.pica()
 
-var mapStalls = obj => {
+const mapStalls = obj => {
   obj._data = _.clone(obj)
   return obj
 }
-var mapProducts = obj => {
+const mapProducts = obj => {
   obj._data = _.clone(obj)
   return obj
 }
-var mapZone = obj => {
+const mapZone = obj => {
   obj._data = _.clone(obj)
   return obj
 }
-var mapOrders = obj => {
+const mapOrders = obj => {
   obj._data = _.clone(obj)
   return obj
 }
-var mapKeys = obj => {
+const mapKeys = obj => {
   obj._data = _.clone(obj)
   return obj
 }
 
+const humanReadableZones = (zones) => {
+  return zones.map(z => `${z.id} - ${z.countries}`)
+}
+
 new Vue({
   el: '#vue',
   mixins: [windowMixin],
@@ -973,6 +977,7 @@ new Vue({
         .then(function (response) {
           if (response.data) {
             self.stalls = response.data.map(mapStalls)
+            console.log(self.stalls)
           }
         })
         .catch(function (error) {
@@ -980,20 +985,13 @@ new Vue({
           })
     },
     openStallDialog: function () {
-      this.zoneOptions = this.zones.map(z => `${z.id} - ${z.countries}`)
-      //console.log(this.zones[0]['id'])
-      //for(let i = 0; i < this.zones.length; i ++){
-      //  this.zoneOptions.push(this.zones[i]['id'])
-      //}
+      this.zoneOptions = humanReadableZones(this.zones)
       this.stallDialog.show = true
     },
     openStallUpdateDialog: function (linkId) {
       var self = this
       var link = _.findWhere(self.stalls, {id: linkId})
-      this.zoneOptions = this.zones.map(z => `${z.id} - ${z.countries}`)
-      //for(let i = 0; i < this.zones.length; i ++){
-      //  this.zoneOptions.push(this.stalls[i][0])
-      //}
+      this.zoneOptions = humanReadableZones(this.zones)
       this.stallDialog.data = _.clone(link._data)
       let shippingzones = this.zoneOptions.filter(z => this.stallDialog.data.shippingzones.split(",").includes(z.split("-")[0].trim()))
         
@@ -1103,10 +1101,11 @@ new Vue({
       LNbits.api
         .request(
           'GET',
-          '/diagonalley/api/v1/products?all_stalls',
+          '/diagonalley/api/v1/products?all_stalls=true',
           self.g.user.wallets[0].inkey
         )
         .then(function (response) {
+          console.log(response.data)
           if (response.data) {
             self.products = response.data.map(mapProducts)
           }
@@ -1123,21 +1122,19 @@ new Vue({
       self.productDialog.show = true
     },
     sendProductFormData: function () {
-      if (this.productDialog.data.id) {
-      } else {
-        var data = {
-          product: this.productDialog.data.product,
-          categories:
-            this.productDialog.data.categories +
-            this.productDialog.categoriesextra,
-          description: this.productDialog.data.description,
-          image: this.productDialog.data.image,
-          price: this.productDialog.data.price,
-          quantity: this.productDialog.data.quantity
-        }
+      var data = {
+        stall: this.productDialog.data.stall,
+        product: this.productDialog.data.product,
+        categories:
+          this.productDialog.data.categories +
+          this.productDialog.categoriesextra,
+        description: this.productDialog.data.description,
+        image: this.productDialog.data.image,
+        price: this.productDialog.data.price,
+        quantity: this.productDialog.data.quantity
       }
       if (this.productDialog.data.id) {
-        this.updateProduct(this.productDialog.data)
+        this.updateProduct({...this.productDialog.data, ...data})
       } else {
         this.createProduct(data)
       }
@@ -1199,12 +1196,16 @@ new Vue({
     },
     createProduct: function (data) {
       var self = this
+      let wallet = _.findWhere(this.stalls, {
+        id: self.productDialog.data.stall
+      }).wallet
+      console.log(wallet)
       LNbits.api
         .request(
           'POST',
           '/diagonalley/api/v1/products',
           _.findWhere(self.g.user.wallets, {
-            id: self.productDialog.data.wallet
+            id: wallet
           }).inkey,
           data
         )
@@ -1570,7 +1571,7 @@ new Vue({
         'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
         'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
       ]
-      console.log(this.products.length)
+      console.log(_.pick(this.g.user, "id")) 
     }
   }
 })
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 06a854f0..d5e5e382 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -73,7 +73,6 @@ async def api_copilot_retrieve(
 
 @diagonalley_ext.get("/api/v1/products")
 async def api_diagonalley_products(
-    req: Request,
     wallet: WalletTypeInfo = Depends(get_key_type),
     all_stalls: bool = Query(False),
 ):
@@ -82,13 +81,15 @@ async def api_diagonalley_products(
     if all_stalls:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return [product.dict() for product in await get_diagonalley_products(wallet_ids)]
+    stalls = [stall.id for stall in await get_diagonalley_stalls(wallet_ids)]
+    
+    return [product.dict() for product in await get_diagonalley_products(stalls)]
 
 
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
-    product_id, data: createProduct, wallet: WalletTypeInfo = Depends(get_key_type)
+    data: createProduct, product_id = None, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
 
     if product_id:

From 88c45a9c4574c6ea2e98db287cd1c593773508ee Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 15 Jul 2022 10:22:13 +0100
Subject: [PATCH 029/174] create and edit products

---
 lnbits/extensions/diagonalley/crud.py         |   4 +-
 lnbits/extensions/diagonalley/migrations.py   |   6 +-
 lnbits/extensions/diagonalley/models.py       |   8 +-
 .../templates/diagonalley/index.html          | 196 +++++++++---------
 lnbits/extensions/diagonalley/views_api.py    |  34 +--
 5 files changed, 131 insertions(+), 117 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 117a2379..44864b80 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -51,7 +51,6 @@ async def create_diagonalley_product(data: createProduct) -> Products:
 async def update_diagonalley_product(product_id: str, **kwargs) -> Optional[Stalls]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
 
-    # with open_ext_db("diagonalley") as db:
     await db.execute(
         f"UPDATE diagonalley.products SET {q} WHERE id = ?",
         (*kwargs.values(), product_id),
@@ -60,7 +59,7 @@ async def update_diagonalley_product(product_id: str, **kwargs) -> Optional[Stal
         "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
     )
 
-    return get_diagonalley_stall(product_id)
+    return Products(**row) if row else None
 
 
 async def get_diagonalley_product(product_id: str) -> Optional[Products]:
@@ -190,6 +189,7 @@ async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
+    print("ROW", row)
     return Stalls(**row) if row else None
 
 
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 11cd2d11..2500dbb0 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -8,9 +8,9 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             stall TEXT NOT NULL,
             product TEXT NOT NULL,
-            categories TEXT NOT NULL,
-            description TEXT NOT NULL,
-            image TEXT NOT NULL,
+            categories TEXT,
+            description TEXT,
+            image TEXT,
             price INTEGER NOT NULL,
             quantity INTEGER NOT NULL
         );
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 9557f6e9..2132d72f 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -25,7 +25,7 @@ class createStalls(BaseModel):
 
 class createProduct(BaseModel):
     stall: str = Query(...)
-    product: str = Query(None)
+    product: str = Query(...)
     categories: str = Query(None)
     description: str = Query(None)
     image: str = Query(None)
@@ -37,9 +37,9 @@ class Products(BaseModel):
     id: str
     stall: str
     product: str
-    categories: str
-    description: str
-    image: str
+    categories: Optional[str]
+    description: Optional[str]
+    image: Optional[str]
     price: int
     quantity: int
 
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index a804898d..7c11f31f 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
 %} {% block page %}
 <div class="row q-col-gutter-md">
+  <!-- PRODUCT DIALOG -->
   <q-dialog v-model="productDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendProductFormData" class="q-gutter-md">
@@ -26,28 +27,37 @@
           v-model.trim="productDialog.data.description"
           label="Description"
         ></q-input>
-        <div class="row">
-          <div class="col-5">
+        <!-- <div class="row"> -->
+          <!-- <div class="col-5">
             <q-select
               filled
               dense
-              v-model.trim="productDialog.data.categories"
               multiple
+              v-model.trim="productDialog.data.categories"
               :options="categories"
               label="Categories"
               class="q-pr-sm"
             ></q-select>
-          </div>
-          <div class="col-7">
-            <q-input
+          </div> -->
+          <!-- <div class="col-7"> -->
+            <q-select
               filled
+              multiple
               dense
-              v-model.trim="productDialog.categoriesextra"
-              placeholder="crafts,robots,etc (seperate by comma)"
-              label="Other categories *optional"
-            ></q-input>
-          </div>
-        </div>
+              emit-value
+              v-model.trim="productDialog.data.categories"
+              use-input
+              use-chips
+              multiple
+              hide-dropdown-icon
+              input-debounce="0"
+              new-value-mode="add-unique"
+              label="Categories"
+              placeholder="crafts,robots,etc"
+              hint="Hit Enter to add"
+            ></q-select>
+          <!-- </div> -->
+        <!-- </div> -->
 
         <q-file
           class="q-pr-md"
@@ -108,14 +118,14 @@
             >Create Product</q-btn
           >
 
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('productDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
       </q-form>
     </q-card>
   </q-dialog>
-
+  <!-- ZONE DIALOG -->
   <q-dialog v-model="zoneDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendZoneFormData" class="q-gutter-md">
@@ -152,15 +162,14 @@
             >Create Shipping Zone</q-btn
           >
 
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('zoneDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
       </q-form>
     </q-card>
   </q-dialog>
-
-
+  <!-- SHOP DIALOG -->
   <q-dialog v-model="shopDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendShopFormData" class="q-gutter-md">
@@ -173,7 +182,8 @@
           filled
           dense
           multiple
-          :options="stalls"
+          emit-value
+          :options="stalls.map(s => ({label: s.name, value: s.id}))"
           label="Stalls"
           v-model.trim="shopDialog.data.stalls"
         ></q-select>
@@ -195,14 +205,14 @@
             >Launch</q-btn
           >
 
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('shopDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
       </q-form>
     </q-card>
   </q-dialog>
-
+  <!-- STALL/STORE DIALOG -->
   <q-dialog v-model="stallDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendStallFormData" class="q-gutter-md">
@@ -292,7 +302,7 @@
             type="submit"
             >Create Store</q-btn
           >
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('stallDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
@@ -328,8 +338,8 @@
       
       </q-card-section>
     </q-card>
-
-    <q-card>
+    
+    <q-card> <!-- ORDERS TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -393,7 +403,7 @@
       </q-card-section>
     </q-card>
 
-    <q-card>
+    <q-card> <!-- PRODUCTS TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -472,8 +482,8 @@
         </q-table>
       </q-card-section>
     </q-card>
-    <!-- STORES -->
-    <q-card>
+    
+    <q-card> <!-- STORES TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -531,8 +541,8 @@
         </q-table>
       </q-card-section>
     </q-card>
-    <!-- ZONES -->
-    <q-card>
+    
+    <q-card> <!-- ZONES TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -658,6 +668,7 @@ const mapStalls = obj => {
 }
 const mapProducts = obj => {
   obj._data = _.clone(obj)
+  console.log(obj)
   return obj
 }
 const mapZone = obj => {
@@ -744,7 +755,8 @@ new Vue({
         'Technology (Phones and Computers)',
         'Home (furniture and accessories)',
         'Gifts (flowers, cards, etc)',
-        'Adult'
+        'Adult',
+        'Other'
       ],
       relayOptions: [
         'wss://nostr-relay.herokuapp.com/ws',
@@ -924,6 +936,10 @@ new Vue({
     }
   },
   methods: {
+    resetDialog(dialog){
+      this[dialog].show = false
+      this[dialog].data = {}
+    },
     generateKeys: function(){
       var self = this
       LNbits.api
@@ -967,6 +983,7 @@ new Vue({
     ////////////////STALLS//////////////////
     ////////////////////////////////////////
     getStalls: function () {
+      console.log(this.g.user)
       var self = this
       LNbits.api
         .request(
@@ -1037,9 +1054,7 @@ new Vue({
             return obj.id == data.id
           })
           self.stalls.push(mapStalls(response.data))
-          self.stallDialog.show = false
-          self.stallDialog.data = {}
-          data = {}
+          self.resetDialog('stallDialog')
         })
         .catch(function (error) {
           LNbits.utils.notifyApiError(error)
@@ -1058,9 +1073,10 @@ new Vue({
         )
         .then(function (response) {
           self.stalls.push(mapStalls(response.data))
-          self.stallDialog.show = false
-          self.stallDialog.data = {}
-          data = {}
+          self.resetDialog('stallDialog')
+          //self.stallDialog.show = false
+          //self.stallDialog.data = {}
+          //data = {}
         })
         .catch(function (error) {
           LNbits.utils.notifyApiError(error)
@@ -1105,7 +1121,7 @@ new Vue({
           self.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          console.log(response.data)
+          console.log("RESP DATA", response.data)
           if (response.data) {
             self.products = response.data.map(mapProducts)
           }
@@ -1119,22 +1135,24 @@ new Vue({
       var link = _.findWhere(self.products, {id: linkId})
 
       self.productDialog.data = _.clone(link._data)
+      self.productDialog.data.categories = self.productDialog.data.categories.split(",")
+      
       self.productDialog.show = true
     },
     sendProductFormData: function () {
+      let _data = {...this.productDialog.data}
       var data = {
-        stall: this.productDialog.data.stall,
-        product: this.productDialog.data.product,
-        categories:
-          this.productDialog.data.categories +
-          this.productDialog.categoriesextra,
-        description: this.productDialog.data.description,
-        image: this.productDialog.data.image,
-        price: this.productDialog.data.price,
-        quantity: this.productDialog.data.quantity
+        stall: _data.stall,
+        product: _data.product,
+        categories: _data.categories && _data.categories.toString(),
+        description: _data.description,
+        image: _data.image,
+        price: _data.price,
+        quantity: _data.quantity
       }
-      if (this.productDialog.data.id) {
-        this.updateProduct({...this.productDialog.data, ...data})
+      if (_data.id) {
+        data.id = _data.id
+        this.updateProduct(data)
       } else {
         this.createProduct(data)
       }
@@ -1163,80 +1181,72 @@ new Vue({
       this.productDialog = {...this.productDialog}
     },
     updateProduct: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/products' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.productDialog.data.wallet
-          }).inkey,
-          _.pick(
-            data,
-            'shopname',
-            'relayaddress',
-            'shippingzone1',
-            'zone1cost',
-            'shippingzone2',
-            'zone2cost',
-            'email'
-          )
-        )
-        .then(function (response) {
-          self.products = _.reject(self.products, function (obj) {
-            return obj.id == data.id
-          })
-          self.products.push(mapProducts(response.data))
-          self.productDialog.show = false
-          self.productDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createProduct: function (data) {
       var self = this
       let wallet = _.findWhere(this.stalls, {
         id: self.productDialog.data.stall
       }).wallet
-      console.log(wallet)
       LNbits.api
         .request(
-          'POST',
-          '/diagonalley/api/v1/products',
+          'PUT',
+          '/diagonalley/api/v1/products/' + data.id,
           _.findWhere(self.g.user.wallets, {
             id: wallet
           }).inkey,
           data
         )
         .then(function (response) {
+          self.products = _.reject(self.products, function (obj) {
+            return obj.id == data.id
+          })
           self.products.push(mapProducts(response.data))
-          self.productDialog.show = false
-          self.productDialog.data = {}
+          self.resetDialog('productDialog')
+          //self.productDialog.show = false
+          //self.productDialog.data = {}
         })
         .catch(function (error) {
           LNbits.utils.notifyApiError(error)
         })
     },
+    createProduct: function (data) {
+      let self = this
+      const walletId = _.findWhere(this.stalls, {id: data.stall}).wallet
+      
+      console.log("DATA", walletId, data)
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/products',
+          _.findWhere(self.g.user.wallets, {id: walletId}).inkey,
+          data
+        )
+        .then((response) => {
+          console.log(response)
+          self.products.push(mapProducts(response.data))
+          self.resetDialog('productDialog')
+        })
+        .catch((error) => {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
     deleteProduct: function (productId) {
-      var self = this
-      var product = _.findWhere(this.products, {id: productId})
-
+      const product = _.findWhere(this.products, {id: productId})
+      const walletId = _.findWhere(this.stalls, {id: product.stall}).wallet
+      
       LNbits.utils
         .confirmDialog('Are you sure you want to delete this products link?')
-        .onOk(function () {
+        .onOk(() => {
           LNbits.api
             .request(
               'DELETE',
               '/diagonalley/api/v1/products/' + productId,
-              _.findWhere(self.g.user.wallets, {id: product.wallet}).inkey
+              _.findWhere(this.g.user.wallets, {id: walletId}).adminkey
             )
-            .then(function (response) {
-              self.products = _.reject(self.products, function (obj) {
+            .then(() => {
+              this.products = _.reject(this.products, (obj) => {
                 return obj.id == productId
               })
             })
-            .catch(function (error) {
+            .catch((error) => {
               LNbits.utils.notifyApiError(error)
             })
         })
@@ -1368,7 +1378,7 @@ new Vue({
       LNbits.api
         .request(
           'GET',
-          '/diagonalley/api/v1/shops?all_wallets',
+          '/diagonalley/api/v1/shops?all_wallets=true',
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index d5e5e382..4630b321 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -82,7 +82,10 @@ async def api_diagonalley_products(
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
     stalls = [stall.id for stall in await get_diagonalley_stalls(wallet_ids)]
-    
+
+    if not stalls:
+        return
+
     return [product.dict() for product in await get_diagonalley_products(stalls)]
 
 
@@ -93,18 +96,18 @@ async def api_diagonalley_product_create(
 ):
 
     if product_id:
-        product = await get_diagonalley_product(product_id)
-
+        product = await get_diagonalley_product(product_id)        
         if not product:
             return {"message": "Withdraw product does not exist."}
-
-        if product.wallet != wallet.wallet.id:
+        
+        stall = await get_diagonalley_stall(stall_id = product.stall)
+        if stall.wallet != wallet.wallet.id:
             return {"message": "Not your withdraw product."}
 
         product = await update_diagonalley_product(product_id, **data.dict())
     else:
         product = await create_diagonalley_product(data=data)
-
+    print("PRODUCT", product)
     return product.dict()
 
 
@@ -117,7 +120,8 @@ async def api_diagonalley_products_delete(
     if not product:
         return {"message": "Product does not exist."}
 
-    if product.wallet != wallet.wallet.id:
+    stall = await get_diagonalley_stall(product.stall)
+    if stall.wallet != wallet.wallet.id:
         return {"message": "Not your Diagon Alley."}
 
     await delete_diagonalley_product(product_id)
@@ -144,7 +148,7 @@ async def api_diagonalley_zone_create(
 @diagonalley_ext.post("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_update(
     data: createZones,
-    zone_id: str = Query(None),
+    zone_id: str,
     wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
     zone = await get_diagonalley_zone(zone_id)
@@ -191,13 +195,13 @@ async def api_diagonalley_stalls(
 @diagonalley_ext.put("/api/v1/stalls/{stall_id}")
 async def api_diagonalley_stall_create(
     data: createStalls,
-    stall_id: str = Query(None),
+    stall_id: str = None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
-
+        print("ID", stall_id)
         if not stall:
             return {"message": "Withdraw stall does not exist."}
 
@@ -213,7 +217,7 @@ async def api_diagonalley_stall_create(
 
 @diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
 async def api_diagonalley_stall_delete(
-    stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
+    stall_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     stall = await get_diagonalley_stall(stall_id)
 
@@ -255,7 +259,7 @@ async def api_diagonalley_order_create(
 
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
 async def api_diagonalley_order_delete(
-    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+    order_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     order = await get_diagonalley_order(order_id)
 
@@ -272,7 +276,7 @@ async def api_diagonalley_order_delete(
 
 @diagonalley_ext.get("/api/v1/orders/paid/{order_id}")
 async def api_diagonalley_order_paid(
-    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
+    order_id, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     await db.execute(
         "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
@@ -286,7 +290,7 @@ async def api_diagonalley_order_paid(
 
 @diagonalley_ext.get("/api/v1/orders/shipped/{order_id}")
 async def api_diagonalley_order_shipped(
-    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+    order_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     await db.execute(
         "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
@@ -307,7 +311,7 @@ async def api_diagonalley_order_shipped(
 
 @diagonalley_ext.get("/api/v1/stall/products/{stall_id}")
 async def api_diagonalley_stall_products(
-    stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+    stall_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
 
     rows = await db.fetchone(

From f9bb1024a7e96820e9bbb6d63bea19a75ffe6cbf Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 15 Jul 2022 10:43:06 +0100
Subject: [PATCH 030/174] rename stall to store

---
 lnbits/extensions/diagonalley/templates/diagonalley/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 7c11f31f..b5c90b76 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -329,7 +329,7 @@
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s).')"
           >+ Store
-          <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
+          <q-tooltip> Create a store to list products on </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="shopDialog.show = true"
           >Launch frontend shop (not Nostr)

From b1bfef87844a5b36a7d48a59a62adc23e17f12a1 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 27 Jan 2022 12:24:38 +0000
Subject: [PATCH 031/174] initial

---
 lnbits/extensions/diagonalley/README.md       |   9 +
 lnbits/extensions/diagonalley/__init__.py     |  16 +
 lnbits/extensions/diagonalley/config.json     |   6 +
 lnbits/extensions/diagonalley/crud.py         | 395 +++++++++
 lnbits/extensions/diagonalley/migrations.py   |  69 ++
 lnbits/extensions/diagonalley/models.py       |  57 ++
 .../extensions/diagonalley/static/js/index.js | 824 ++++++++++++++++++
 lnbits/extensions/diagonalley/tasks.py        |  29 +
 .../templates/diagonalley/_api_docs.html      | 129 +++
 .../templates/diagonalley/index.html          | 634 ++++++++++++++
 .../templates/diagonalley/stall.html          |   9 +
 lnbits/extensions/diagonalley/views.py        |  44 +
 lnbits/extensions/diagonalley/views_api.py    | 348 ++++++++
 13 files changed, 2569 insertions(+)
 create mode 100644 lnbits/extensions/diagonalley/README.md
 create mode 100644 lnbits/extensions/diagonalley/__init__.py
 create mode 100644 lnbits/extensions/diagonalley/config.json
 create mode 100644 lnbits/extensions/diagonalley/crud.py
 create mode 100644 lnbits/extensions/diagonalley/migrations.py
 create mode 100644 lnbits/extensions/diagonalley/models.py
 create mode 100644 lnbits/extensions/diagonalley/static/js/index.js
 create mode 100644 lnbits/extensions/diagonalley/tasks.py
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/index.html
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/stall.html
 create mode 100644 lnbits/extensions/diagonalley/views.py
 create mode 100644 lnbits/extensions/diagonalley/views_api.py

diff --git a/lnbits/extensions/diagonalley/README.md b/lnbits/extensions/diagonalley/README.md
new file mode 100644
index 00000000..e8035b74
--- /dev/null
+++ b/lnbits/extensions/diagonalley/README.md
@@ -0,0 +1,9 @@
+<h1>Diagon Alley</h1>
+<h2>A movable market stand</h2>
+Make a list of products to sell, point the list to an relay (or many), stack sats.
+Diagon Alley is a movable market stand, for anon transactions. You then give permission for an relay to list those products. Delivery addresses are sent through the Lightning Network.
+<img src="https://i.imgur.com/P1tvBSG.png">
+
+<h2>API endpoints</h2>
+
+<code>curl -X GET http://YOUR-TOR-ADDRESS</code>
diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
new file mode 100644
index 00000000..720c55c8
--- /dev/null
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -0,0 +1,16 @@
+from quart import Blueprint
+from lnbits.db import Database
+
+db = Database("ext_diagonalley")
+
+diagonalley_ext: Blueprint = Blueprint(
+    "diagonalley", __name__, static_folder="static", template_folder="templates"
+)
+
+from .views_api import *  # noqa
+from .views import *  # noqa
+
+from .tasks import register_listeners
+from lnbits.tasks import record_async
+
+diagonalley_ext.record(record_async(register_listeners))
diff --git a/lnbits/extensions/diagonalley/config.json b/lnbits/extensions/diagonalley/config.json
new file mode 100644
index 00000000..99e92e9b
--- /dev/null
+++ b/lnbits/extensions/diagonalley/config.json
@@ -0,0 +1,6 @@
+{
+    "name": "Diagon Alley",
+    "short_description": "Movable anonymous market stand",
+    "icon": "add_shopping_cart",
+    "contributors": ["benarc","DeanH"]
+}
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
new file mode 100644
index 00000000..c6ce8222
--- /dev/null
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -0,0 +1,395 @@
+from base64 import urlsafe_b64encode
+from uuid import uuid4
+from typing import List, Optional, Union
+
+from lnbits.settings import WALLET
+
+# from lnbits.db import open_ext_db
+from lnbits.db import SQLITE
+from . import db
+from .models import Products, Orders, Stalls, Zones
+
+import httpx
+from lnbits.helpers import urlsafe_short_hash
+import re
+
+regex = re.compile(
+    r"^(?:http|ftp)s?://"  # http:// or https://
+    r"(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|"
+    r"localhost|"
+    r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})"
+    r"(?::\d+)?"
+    r"(?:/?|[/?]\S+)$",
+    re.IGNORECASE,
+)
+
+
+###Products
+
+
+async def create_diagonalley_product(
+    *,
+    stall_id: str,
+    product: str,
+    categories: str,
+    description: str,
+    image: Optional[str] = None,
+    price: int,
+    quantity: int,
+    shippingzones: str,
+) -> Products:
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
+    product_id = urlsafe_short_hash()
+    # with open_ext_db("diagonalley") as db:
+    result = await (method)(
+        f"""
+        INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity, shippingzones)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+        {returning}
+        """,
+        (
+            product_id,
+            stall_id,
+            product,
+            categories,
+            description,
+            image,
+            price,
+            quantity,
+        ),
+    )
+    product = await get_diagonalley_product(product_id)
+    assert product, "Newly created product couldn't be retrieved"
+    return product
+
+
+async def update_diagonalley_product(product_id: str, **kwargs) -> Optional[Stalls]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+
+    # with open_ext_db("diagonalley") as db:
+    await db.execute(
+        f"UPDATE diagonalley.products SET {q} WHERE id = ?",
+        (*kwargs.values(), product_id),
+    )
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
+    )
+
+    return get_diagonalley_stall(product_id)
+
+
+async def get_diagonalley_product(product_id: str) -> Optional[Products]:
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
+    )
+    return Products.from_row(row) if row else None
+
+
+async def get_diagonalley_products(wallet_ids: Union[str, List[str]]) -> List[Products]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+
+    # with open_ext_db("diagonalley") as db:
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"""
+        SELECT * FROM diagonalley.products WHERE stall IN ({q})
+        """,
+        (*wallet_ids,),
+    )
+    return [Products.from_row(row) for row in rows]
+
+
+async def delete_diagonalley_product(product_id: str) -> None:
+    await db.execute("DELETE FROM diagonalley.products WHERE id = ?", (product_id,))
+
+
+###zones
+
+
+async def create_diagonalley_zone(
+    *,
+    wallet: Optional[str] = None,
+    cost: Optional[int] = 0,
+    countries: Optional[str] = None,
+) -> Zones:
+
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
+
+    zone_id = urlsafe_short_hash()
+    result = await (method)(
+        f"""
+        INSERT INTO diagonalley.zones (
+            id,
+            wallet,
+            cost,
+            countries
+
+        )
+        VALUES (?, ?, ?, ?)
+        {returning}
+        """,
+        (zone_id, wallet, cost, countries),
+    )
+
+    zone = await get_diagonalley_zone(zone_id)
+    assert zone, "Newly created zone couldn't be retrieved"
+    return zone
+
+
+async def update_diagonalley_zone(zone_id: str, **kwargs) -> Optional[Zones]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+    await db.execute(
+        f"UPDATE diagonalley.zones SET {q} WHERE id = ?",
+        (*kwargs.values(), zone_id),
+    )
+    row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
+    return Zones.from_row(row) if row else None
+
+
+async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
+    row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
+    return Zones.from_row(row) if row else None
+
+
+async def get_diagonalley_zones(wallet_ids: Union[str, List[str]]) -> List[Zones]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+        print(wallet_ids)
+
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+
+    for r in rows:
+        try:
+            x = httpx.get(r["zoneaddress"] + "/" + r["ratingkey"])
+            if x.status_code == 200:
+                await db.execute(
+                    "UPDATE diagonalley.zones SET online = ? WHERE id = ?",
+                    (
+                        True,
+                        r["id"],
+                    ),
+                )
+            else:
+                await db.execute(
+                    "UPDATE diagonalley.zones SET online = ? WHERE id = ?",
+                    (
+                        False,
+                        r["id"],
+                    ),
+                )
+        except:
+            print("An exception occurred")
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+    return [Zones.from_row(row) for row in rows]
+
+
+async def delete_diagonalley_zone(zone_id: str) -> None:
+    await db.execute("DELETE FROM diagonalley.zones WHERE id = ?", (zone_id,))
+
+
+###Stalls
+
+
+async def create_diagonalley_stall(
+    *,
+    wallet: str,
+    name: str,
+    publickey: str,
+    privatekey: str,
+    relays: str,
+    shippingzones: str,
+) -> Stalls:
+
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
+
+    stall_id = urlsafe_short_hash()
+    result = await (method)(
+        f"""
+        INSERT INTO diagonalley.stalls (
+            id,
+            wallet,
+            name,
+            publickey,
+            privatekey,
+            relays,
+            shippingzones
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+        {returning}
+        """,
+        (stall_id, wallet, name, publickey, privatekey, relays, shippingzones),
+    )
+
+    stall = await get_diagonalley_stall(stall_id)
+    assert stall, "Newly created stall couldn't be retrieved"
+    return stall
+
+
+async def update_diagonalley_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+    await db.execute(
+        f"UPDATE diagonalley.stalls SET {q} WHERE id = ?",
+        (*kwargs.values(), stall_id),
+    )
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+    )
+    return Stalls.from_row(row) if row else None
+
+
+async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
+    roww = await db.fetchone(
+        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+    )
+
+    try:
+        x = httpx.get(roww["stalladdress"] + "/" + roww["ratingkey"])
+        if x.status_code == 200:
+            await db.execute(
+                "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
+                (
+                    True,
+                    stall_id,
+                ),
+            )
+        else:
+            await db.execute(
+                "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
+                (
+                    False,
+                    stall_id,
+                ),
+            )
+    except:
+        print("An exception occurred")
+
+    # with open_ext_db("diagonalley") as db:
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+    )
+    return Stalls.from_row(row) if row else None
+
+
+async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+
+    for r in rows:
+        try:
+            x = httpx.get(r["stalladdress"] + "/" + r["ratingkey"])
+            if x.status_code == 200:
+                await db.execute(
+                    "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
+                    (
+                        True,
+                        r["id"],
+                    ),
+                )
+            else:
+                await db.execute(
+                    "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
+                    (
+                        False,
+                        r["id"],
+                    ),
+                )
+        except:
+            print("An exception occurred")
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+    return [Stalls.from_row(row) for row in rows]
+
+
+async def delete_diagonalley_stall(stall_id: str) -> None:
+    await db.execute("DELETE FROM diagonalley.stalls WHERE id = ?", (stall_id,))
+
+
+###Orders
+
+
+async def create_diagonalley_order(
+    *,
+    productid: str,
+    wallet: str,
+    product: str,
+    quantity: int,
+    shippingzone: str,
+    address: str,
+    email: str,
+    invoiceid: str,
+    paid: bool,
+    shipped: bool,
+) -> Orders:
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
+
+    order_id = urlsafe_short_hash()
+    result = await (method)(
+        f"""
+            INSERT INTO diagonalley.orders (id, productid, wallet, product,
+            quantity, shippingzone, address, email, invoiceid, paid, shipped)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            {returning}
+            """,
+        (
+            order_id,
+            productid,
+            wallet,
+            product,
+            quantity,
+            shippingzone,
+            address,
+            email,
+            invoiceid,
+            False,
+            False,
+        ),
+    )
+    if db.type == SQLITE:
+        order_id = result._result_proxy.lastrowid
+    else:
+        order_id = result[0]
+
+    link = await get_diagonalley_order(order_id)
+    assert link, "Newly created link couldn't be retrieved"
+    return link
+
+
+async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
+    )
+    return Orders.from_row(row) if row else None
+
+
+async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})", (*wallet_ids,)
+    )
+    #
+    return [Orders.from_row(row) for row in rows]
+
+
+async def delete_diagonalley_order(order_id: str) -> None:
+    await db.execute("DELETE FROM diagonalley.orders WHERE id = ?", (order_id,))
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
new file mode 100644
index 00000000..1523f398
--- /dev/null
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -0,0 +1,69 @@
+async def m001_initial(db):
+    """
+    Initial products table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.products (
+            id TEXT PRIMARY KEY,
+            stall TEXT NOT NULL,
+            product TEXT NOT NULL,
+            categories TEXT NOT NULL,
+            description TEXT NOT NULL,
+            image TEXT NOT NULL,
+            price INTEGER NOT NULL,
+            quantity INTEGER NOT NULL
+        );
+    """
+    )
+
+    """
+    Initial stalls table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.stalls (
+            id TEXT PRIMARY KEY,
+            wallet TEXT NOT NULL,
+            name TEXT NOT NULL,
+            publickey TEXT NOT NULL,
+            privatekey TEXT NOT NULL,
+            relays TEXT NOT NULL
+        );
+    """
+    )
+
+    """
+    Initial zones table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.zones (
+            id TEXT PRIMARY KEY,
+            wallet TEXT NOT NULL,
+            cost TEXT NOT NULL,
+            countries TEXT NOT NULL
+        );
+    """
+    )
+
+    """
+    Initial orders table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.orders (
+            id TEXT PRIMARY KEY,
+            productid TEXT NOT NULL,
+            wallet TEXT NOT NULL,
+            product TEXT NOT NULL,
+            quantity INTEGER NOT NULL,
+            shippingzone INTEGER NOT NULL,
+            address TEXT NOT NULL,
+            email TEXT NOT NULL,
+            invoiceid TEXT NOT NULL,
+            paid BOOLEAN NOT NULL,
+            shipped BOOLEAN NOT NULL
+        );
+    """
+    )
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
new file mode 100644
index 00000000..0f2a1d78
--- /dev/null
+++ b/lnbits/extensions/diagonalley/models.py
@@ -0,0 +1,57 @@
+from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
+from starlette.requests import Request
+from fastapi.param_functions import Query
+from typing import Optional, Dict
+from lnbits.lnurl import encode as lnurl_encode  # type: ignore
+from lnurl.types import LnurlPayMetadata  # type: ignore
+from pydantic import BaseModel
+import json
+from sqlite3 import Row
+
+
+class Stalls(BaseModel):
+    id: str = Query(None)
+    wallet: str = Query(None)
+    name: str = Query(None)
+    publickey: str = Query(None)
+    privatekey: str = Query(None)
+    relays: str = Query(None)
+
+class createStalls(BaseModel):
+    wallet: str = Query(None)
+    name: str = Query(None)
+    publickey: str = Query(None)
+    privatekey: str = Query(None)
+    relays: str = Query(None)
+    shippingzones: str = Query(None)
+
+class Products(BaseModel):
+    id: str = Query(None)
+    stall: str = Query(None)
+    product: str = Query(None)
+    categories: str = Query(None)
+    description: str = Query(None)
+    image: str = Query(None)
+    price: int = Query(0)
+    quantity: int = Query(0)
+
+
+class Zones(BaseModel):
+    id: str = Query(None)
+    wallet: str = Query(None)
+    cost: str = Query(None)
+    countries: str = Query(None)
+
+
+class Orders(BaseModel):
+    id: str = Query(None)
+    productid: str = Query(None)
+    stall: str = Query(None)
+    product: str = Query(None)
+    quantity: int = Query(0)
+    shippingzone: int = Query(0)
+    address: str = Query(None)
+    email: str = Query(None)
+    invoiceid: str = Query(None)
+    paid: bool
+    shipped: bool
diff --git a/lnbits/extensions/diagonalley/static/js/index.js b/lnbits/extensions/diagonalley/static/js/index.js
new file mode 100644
index 00000000..1a25edaa
--- /dev/null
+++ b/lnbits/extensions/diagonalley/static/js/index.js
@@ -0,0 +1,824 @@
+/* globals Quasar, Vue, _, VueQrcode, windowMixin, LNbits, LOCALE */
+
+Vue.component(VueQrcode.name, VueQrcode)
+
+const pica = window.pica()
+
+new Vue({
+  el: '#vue',
+  mixins: [windowMixin],
+  data: function () {
+    return {
+      products: [],
+      orders: [],
+      stalls: [],
+      zones: [],
+      shippedModel: false,
+      shippingZoneOptions: [
+        'Australia',
+        'Austria',
+        'Belgium',
+        'Brazil',
+        'Canada',
+        'Denmark',
+        'Finland',
+        'France*',
+        'Germany',
+        'Greece',
+        'Hong Kong',
+        'Hungary',
+        'Ireland',
+        'Indonesia',
+        'Israel',
+        'Italy',
+        'Japan',
+        'Kazakhstan',
+        'Korea',
+        'Luxembourg',
+        'Malaysia',
+        'Mexico',
+        'Netherlands',
+        'New Zealand',
+        'Norway',
+        'Poland',
+        'Portugal',
+        'Russia',
+        'Saudi Arabia',
+        'Singapore',
+        'Spain',
+        'Sweden',
+        'Switzerland',
+        'Thailand',
+        'Turkey',
+        'Ukraine',
+        'United Kingdom**',
+        'United States***',
+        'Vietnam',
+        'China'
+      ],
+      categories: [
+        'Fashion (clothing and accessories)',
+        'Health (and beauty)',
+        'Toys (and baby equipment)',
+        'Media (Books and CDs)',
+        'Groceries (Food and Drink)',
+        'Technology (Phones and Computers)',
+        'Home (furniture and accessories)',
+        'Gifts (flowers, cards, etc)'
+      ],
+      relayOptions: [
+        'wss://nostr-relay.herokuapp.com/ws',
+        'wss://nostr-relay.bigsun.xyz/ws',
+        'wss://freedom-relay.herokuapp.com/ws'
+      ],
+      label: '',
+      ordersTable: {
+        columns: [
+          {
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },
+          {
+            name: 'address',
+            align: 'left',
+            label: 'Address',
+            field: 'address'
+          },
+          {
+            name: 'invoiceid',
+            align: 'left',
+            label: 'InvoiceID',
+            field: 'invoiceid'
+          },
+          {name: 'paid', align: 'left', label: 'Paid', field: 'paid'},
+          {name: 'shipped', align: 'left', label: 'Shipped', field: 'shipped'}
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      productsTable: {
+        columns: [
+          {
+            name: 'stall',
+            align: 'left',
+            label: 'Stall',
+            field: 'stall'
+          },
+          {
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'description',
+            align: 'left',
+            label: 'Description',
+            field: 'description'
+          },
+          {
+            name: 'categories',
+            align: 'left',
+            label: 'Categories',
+            field: 'categories'
+          },
+          {name: 'price', align: 'left', label: 'Price', field: 'price'},
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },
+          {name: 'id', align: 'left', label: 'ID', field: 'id'}
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      stallTable: {
+        columns: [
+          {
+            name: 'id',
+            align: 'left',
+            label: 'ID',
+            field: 'id'
+          },
+          {
+            name: 'name',
+            align: 'left',
+            label: 'Name',
+            field: 'name'
+          },
+          {
+            name: 'wallet',
+            align: 'left',
+            label: 'Wallet',
+            field: 'wallet'
+          },
+          {
+            name: 'publickey',
+            align: 'left',
+            label: 'Public key',
+            field: 'publickey'
+          },
+          {
+            name: 'privatekey',
+            align: 'left',
+            label: 'Private key',
+            field: 'privatekey'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      zonesTable: {
+        columns: [
+          {
+            name: 'id',
+            align: 'left',
+            label: 'ID',
+            field: 'id'
+          },
+          {
+            name: 'countries',
+            align: 'left',
+            label: 'Countries',
+            field: 'countries'
+          },
+          {
+            name: 'cost',
+            align: 'left',
+            label: 'Cost',
+            field: 'cost'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      productDialog: {
+        show: false,
+        data: {}
+      },
+      stallDialog: {
+        show: false,
+        data: {}
+      },
+      zoneDialog: {
+        show: false,
+        data: {}
+      },
+      shopDialog: {
+        show: false,
+        data: {activate: false}
+      },
+      orderDialog: {
+        show: false,
+        data: {}
+      },
+      relayDialog: {
+        show: false,
+        data: {}
+      }
+    }
+  },
+  computed: {
+    categoryOther: function () {
+      cats = trim(this.productDialog.data.categories.split(','))
+      for (let i = 0; i < cats.length; i++) {
+        if (cats[i] == 'Others') {
+          return true
+        }
+      }
+      return false
+    }
+  },
+  methods: {
+    ////////////////////////////////////////
+    ////////////////STALLS//////////////////
+    ////////////////////////////////////////
+    getStalls: function () {
+      var self = this
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/stalls?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.stalls = response.data.map(function (obj) {
+            console.log(obj)
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    openStallUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.stalls, {id: linkId})
+
+      this.stallDialog.data = _.clone(link._data)
+      this.stallDialog.show = true
+    },
+    sendStallFormData: function () {
+      if (this.stallDialog.data.id) {
+      } else {
+        var data = {
+          name: this.stallDialog.data.name,
+          wallet: this.stallDialog.data.wallet,
+          publickey: this.stallDialog.data.publickey,
+          privatekey: this.stallDialog.data.privatekey,
+          relays: this.stallDialog.data.relays
+        }
+      }
+
+      if (this.stallDialog.data.id) {
+        this.updateStall(this.stallDialog.data)
+      } else {
+        this.createStall(data)
+      }
+    },
+    updateStall: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/stalls' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.stallDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'name', 'wallet', 'publickey', 'privatekey')
+        )
+        .then(function (response) {
+          self.stalls = _.reject(self.stalls, function (obj) {
+            return obj.id == data.id
+          })
+          self.stalls.push(mapDiagonAlley(response.data))
+          self.stallDialog.show = false
+          self.stallDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createStall: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/stalls',
+          _.findWhere(self.g.user.wallets, {
+            id: self.stallDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.stalls.push(mapDiagonAlley(response.data))
+          self.stallDialog.show = false
+          self.stallDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteStall: function (stallId) {
+      var self = this
+      var stall = _.findWhere(self.stalls, {id: stallId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Stall link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/stalls/' + stallId,
+              _.findWhere(self.g.user.wallets, {id: stall.wallet}).inkey
+            )
+            .then(function (response) {
+              self.stalls = _.reject(self.stalls, function (obj) {
+                return obj.id == stallId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportStallsCSV: function () {
+      LNbits.utils.exportCSV(this.stallsTable.columns, this.stalls)
+    },
+    ////////////////////////////////////////
+    ///////////////PRODUCTS/////////////////
+    ////////////////////////////////////////
+    getProducts: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/products?all_stalls',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.products = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    openProductUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.products, {id: linkId})
+
+      self.productDialog.data = _.clone(link._data)
+      self.productDialog.show = true
+    },
+    sendProductFormData: function () {
+      if (this.productDialog.data.id) {
+      } else {
+        var data = {
+          product: this.productDialog.data.product,
+          categories:
+            this.productDialog.data.categories +
+            this.productDialog.categoriesextra,
+          description: this.productDialog.data.description,
+          image: this.productDialog.data.image,
+          price: this.productDialog.data.price,
+          quantity: this.productDialog.data.quantity
+        }
+      }
+      if (this.productDialog.data.id) {
+        this.updateProduct(this.productDialog.data)
+      } else {
+        this.createProduct(data)
+      }
+    },
+    imageAdded(file) {
+      let blobURL = URL.createObjectURL(file)
+      let image = new Image()
+      image.src = blobURL
+      image.onload = async () => {
+        let canvas = document.createElement('canvas')
+        canvas.setAttribute('width', 100)
+        canvas.setAttribute('height', 100)
+        await pica.resize(image, canvas, {
+          quality: 0,
+          alpha: true,
+          unsharpAmount: 95,
+          unsharpRadius: 0.9,
+          unsharpThreshold: 70
+        })
+        this.productDialog.data.image = canvas.toDataURL()
+        this.productDialog = {...this.productDialog}
+      }
+    },
+    imageCleared() {
+      this.productDialog.data.image = null
+      this.productDialog = {...this.productDialog}
+    },
+    updateProduct: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/products' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.productDialog.data.wallet
+          }).inkey,
+          _.pick(
+            data,
+            'shopname',
+            'relayaddress',
+            'shippingzone1',
+            'zone1cost',
+            'shippingzone2',
+            'zone2cost',
+            'email'
+          )
+        )
+        .then(function (response) {
+          self.products = _.reject(self.products, function (obj) {
+            return obj.id == data.id
+          })
+          self.products.push(mapDiagonAlley(response.data))
+          self.productDialog.show = false
+          self.productDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createProduct: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/products',
+          _.findWhere(self.g.user.wallets, {
+            id: self.productDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.products.push(mapDiagonAlley(response.data))
+          self.productDialog.show = false
+          self.productDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteProduct: function (productId) {
+      var self = this
+      var product = _.findWhere(this.products, {id: productId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this products link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/products/' + productId,
+              _.findWhere(self.g.user.wallets, {id: product.wallet}).inkey
+            )
+            .then(function (response) {
+              self.products = _.reject(self.products, function (obj) {
+                return obj.id == productId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportProductsCSV: function () {
+      LNbits.utils.exportCSV(this.productsTable.columns, this.products)
+    },
+    ////////////////////////////////////////
+    //////////////////ZONE//////////////////
+    ////////////////////////////////////////
+    getZones: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/zones?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.zones = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    openZoneUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.zones, {id: linkId})
+
+      this.zoneDialog.data = _.clone(link._data)
+      this.zoneDialog.show = true
+    },
+    sendZoneFormData: function () {
+      if (this.zoneDialog.data.id) {
+      } else {
+        var data = {
+          countries: toString(this.zoneDialog.data.countries),
+          cost: parseInt(this.zoneDialog.data.cost)
+        }
+      }
+
+      if (this.zoneDialog.data.id) {
+        this.updateZone(this.zoneDialog.data)
+      } else {
+        this.createZone(data)
+      }
+    },
+    updateZone: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/zones' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.zoneDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'countries', 'cost')
+        )
+        .then(function (response) {
+          self.zones = _.reject(self.zones, function (obj) {
+            return obj.id == data.id
+          })
+          self.zones.push(mapDiagonAlley(response.data))
+          self.zoneDialog.show = false
+          self.zoneDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createZone: function (data) {
+      var self = this
+      console.log(self.g.user.wallets[0])
+      console.log(data)
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/zones',
+          self.g.user.wallets[0].inkey,
+          data
+        )
+        .then(function (response) {
+          self.zones.push(mapDiagonAlley(response.data))
+          self.zoneDialog.show = false
+          self.zoneDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteZone: function (zoneId) {
+      var self = this
+      var zone = _.findWhere(self.zones, {id: zoneId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Zone link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/zones/' + zoneId,
+              _.findWhere(self.g.user.wallets, {id: zone.wallet}).inkey
+            )
+            .then(function (response) {
+              self.zones = _.reject(self.zones, function (obj) {
+                return obj.id == zoneId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportZonesCSV: function () {
+      LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
+    },
+    ////////////////////////////////////////
+    //////////////////SHOP//////////////////
+    ////////////////////////////////////////
+    getShops: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/shops?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.shops = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    openShopUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.shops, {id: linkId})
+
+      this.shopDialog.data = _.clone(link._data)
+      this.shopDialog.show = true
+    },
+    sendShopFormData: function () {
+      if (this.shopDialog.data.id) {
+      } else {
+        var data = {
+          countries: this.shopDialog.data.countries,
+          cost: this.shopDialog.data.cost
+        }
+      }
+
+      if (this.shopDialog.data.id) {
+        this.updateZone(this.shopDialog.data)
+      } else {
+        this.createZone(data)
+      }
+    },
+    updateShop: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/shops' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.shopDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'countries', 'cost')
+        )
+        .then(function (response) {
+          self.shops = _.reject(self.shops, function (obj) {
+            return obj.id == data.id
+          })
+          self.shops.push(mapDiagonAlley(response.data))
+          self.shopDialog.show = false
+          self.shopDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createShop: function (data) {
+      var self = this
+      console.log('cuntywoo')
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/shops',
+          _.findWhere(self.g.user.wallets, {
+            id: self.shopDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.shops.push(mapDiagonAlley(response.data))
+          self.shopDialog.show = false
+          self.shopDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteShop: function (shopId) {
+      var self = this
+      var shop = _.findWhere(self.shops, {id: shopId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Shop link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/shops/' + shopId,
+              _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
+            )
+            .then(function (response) {
+              self.shops = _.reject(self.shops, function (obj) {
+                return obj.id == shopId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportShopsCSV: function () {
+      LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
+    },
+    ////////////////////////////////////////
+    ////////////////ORDERS//////////////////
+    ////////////////////////////////////////
+    getOrders: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/orders?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.orders = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    createOrder: function () {
+      var data = {
+        address: this.orderDialog.data.address,
+        email: this.orderDialog.data.email,
+        quantity: this.orderDialog.data.quantity,
+        shippingzone: this.orderDialog.data.shippingzone
+      }
+      var self = this
+
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/orders',
+          _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
+            .inkey,
+          data
+        )
+        .then(function (response) {
+          self.orders.push(mapDiagonAlley(response.data))
+          self.orderDialog.show = false
+          self.orderDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteOrder: function (orderId) {
+      var self = this
+      var order = _.findWhere(self.orders, {id: orderId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this order link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/orders/' + orderId,
+              _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
+            )
+            .then(function (response) {
+              self.orders = _.reject(self.orders, function (obj) {
+                return obj.id == orderId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    shipOrder: function (order_id) {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/orders/shipped/' + order_id,
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.orders = response.data.map(function (obj) {
+            return mapDiagonAlley(obj)
+          })
+        })
+    },
+    exportOrdersCSV: function () {
+      LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
+    }
+  },
+  created: function () {
+    if (this.g.user.wallets.length) {
+      this.getStalls()
+      this.getProducts()
+      this.getZones()
+      this.getOrders()
+    }
+  }
+})
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/diagonalley/tasks.py
new file mode 100644
index 00000000..3fee63d9
--- /dev/null
+++ b/lnbits/extensions/diagonalley/tasks.py
@@ -0,0 +1,29 @@
+import asyncio
+
+from lnbits.core.models import Payment
+from lnbits.tasks import register_invoice_listener
+
+from .crud import get_ticket, set_ticket_paid
+
+
+async def wait_for_paid_invoices():
+    invoice_queue = asyncio.Queue()
+    register_invoice_listener(invoice_queue)
+
+    while True:
+        payment = await invoice_queue.get()
+        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)
\ No newline at end of file
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html b/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
new file mode 100644
index 00000000..530c89e8
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
@@ -0,0 +1,129 @@
+<q-expansion-item
+  group="extras"
+  icon="swap_vertical_circle"
+  label="Setup guide"
+  :content-inset-level="0.5"
+>
+  <q-card>
+    <q-card-section>
+      <h5 class="text-subtitle1 q-my-none">
+        Diagon Alley: Decentralised Market-Stalls
+      </h5>
+      <p>
+        Each Stall has its own keys!<br />
+        <ol>
+          <li>Create Shipping Zones you're willing to ship to</li>
+          <li>Create a Stall to list yiur products on</li>
+          <li>Create products to put on the Stall</li>
+          <li>List stalls on a simple frontend shop page, or point at Nostr shop client key</li>
+        </ol> 
+        Make a list of products to sell, point your list of products at a public
+        relay. Buyers browse your products on the relay, and pay you directly.
+        Ratings are managed by the relay. Your stall can be listed in multiple
+        relays, even over TOR, if you wish to be anonymous.<br />
+        More information on the
+        <a href="https://github.com/lnbits/Diagon-Alley"
+          >Diagon Alley Protocol</a
+        ><br />
+        <small>
+          Created by, <a href="https://github.com/benarc">Ben Arc</a></small
+        >
+      </p>
+    </q-card-section>
+  </q-card>
+</q-expansion-item>
+
+<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="Get prodcuts, categorised by wallet"
+  >
+    <q-card>
+      <q-card-section>
+        <code
+          ><span class="text-light-blue">GET</span>
+          /diagonalley/api/v1/stall/products/&lt;relay_id&gt;</code
+        >
+        <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 201 CREATED (application/json)
+        </h5>
+        <code>Product JSON list</code>
+        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+        <code
+          >curl -X GET {{ request.url_root
+          }}api/v1/stall/products/&lt;relay_id&gt;</code
+        >
+      </q-card-section>
+    </q-card>
+  </q-expansion-item>
+  <q-expansion-item
+    group="api"
+    dense
+    expand-separator
+    label="Get invoice for product"
+  >
+    <q-card>
+      <q-card-section>
+        <code
+          ><span class="text-light-green">POST</span>
+          /diagonalley/api/v1/stall/order/&lt;relay_id&gt;</code
+        >
+        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
+        <code
+          >{"id": &lt;string&gt;, "address": &lt;string&gt;, "shippingzone":
+          &lt;integer&gt;, "email": &lt;string&gt;, "quantity":
+          &lt;integer&gt;}</code
+        >
+        <h5 class="text-caption q-mt-sm q-mb-none">
+          Returns 201 CREATED (application/json)
+        </h5>
+        <code
+          >{"checking_id": &lt;string&gt;,"payment_request":
+          &lt;string&gt;}</code
+        >
+        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+        <code
+          >curl -X POST {{ request.url_root
+          }}api/v1/stall/order/&lt;relay_id&gt; -d '{"id": &lt;product_id&&gt;,
+          "email": &lt;customer_email&gt;, "address": &lt;customer_address&gt;,
+          "quantity": 2, "shippingzone": 1}' -H "Content-type: application/json"
+        </code>
+      </q-card-section>
+    </q-card>
+  </q-expansion-item>
+  <q-expansion-item
+    group="api"
+    dense
+    expand-separator
+    label="Check a product has been shipped"
+    class="q-mb-md"
+  >
+    <q-card>
+      <q-card-section>
+        <code
+          ><span class="text-light-blue">GET</span>
+          /diagonalley/api/v1/stall/checkshipped/&lt;checking_id&gt;</code
+        >
+        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+        <h5 class="text-caption q-mt-sm q-mb-none">
+          Returns 200 OK (application/json)
+        </h5>
+        <code>{"shipped": &lt;boolean&gt;}</code>
+        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+        <code
+          >curl -X GET {{ request.url_root
+          }}api/v1/stall/checkshipped/&lt;checking_id&gt; -H "Content-type:
+          application/json"</code
+        >
+      </q-card-section>
+    </q-card>
+  </q-expansion-item>
+</q-expansion-item>
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
new file mode 100644
index 00000000..98405f6d
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -0,0 +1,634 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+<div class="row q-col-gutter-md">
+  <q-dialog v-model="productDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="sendProductFormData" class="q-gutter-md">
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="productDialog.data.stall"
+          :options="stalls"
+          label="Stall"
+        >
+        </q-select>
+        <q-input
+          filled
+          dense
+          v-model.trim="productDialog.data.product"
+          label="Product"
+        ></q-input>
+
+        <q-input
+          filled
+          dense
+          v-model.trim="productDialog.data.description"
+          label="Description"
+        ></q-input>
+        <div class="row">
+          <div class="col-5">
+            <q-select
+              filled
+              dense
+              v-model.trim="productDialog.data.categories"
+              multiple
+              :options="categories"
+              label="Categories"
+              class="q-pr-sm"
+            ></q-select>
+          </div>
+          <div class="col-7">
+            <q-input
+              filled
+              dense
+              v-model.trim="productDialog.categoriesextra"
+              placeholder="crafts,robots,etc (seperate by comma)"
+              label="Other categories *optional"
+            ></q-input>
+          </div>
+        </div>
+
+        <q-file
+          class="q-pr-md"
+          filled
+          dense
+          capture="environment"
+          accept="image/jpeg, image/png"
+          :max-file-size="3*1024**2"
+          label="Small image (optional)"
+          clearable
+          @input="imageAdded"
+          @clear="imageCleared"
+        >
+          <template v-if="productDialog.data.image" v-slot:before>
+            <img style="height: 1em" :src="productDialog.data.image" />
+          </template>
+          <template v-if="productDialog.data.image" v-slot:append>
+            <q-icon
+              name="cancel"
+              @click.stop.prevent="imageCleared"
+              class="cursor-pointer"
+            />
+          </template>
+        </q-file>
+        <q-input
+          filled
+          dense
+          v-model.number="productDialog.data.price"
+          type="number"
+          label="Price"
+        ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.number="productDialog.data.quantity"
+          type="number"
+          label="Quantity"
+        ></q-input>
+
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="productDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Product</q-btn
+          >
+
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="productDialog.data.image == null
+              || productDialog.data.product == null
+              || productDialog.data.description == null
+              || productDialog.data.quantity == null"
+            type="submit"
+            >Create Product</q-btn
+          >
+
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="zoneDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="sendZoneFormData" class="q-gutter-md">
+        <q-select
+          filled
+          dense
+          multiple
+          :options="shippingZoneOptions"
+          label="Countries"
+          v-model.trim="zoneDialog.data.countries"
+        ></q-select>
+        <q-input
+          filled
+          dense
+          type="number"
+          v-model.trim="zoneDialog.data.cost"
+          label="Cost (sats)"
+        ></q-input>
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="zoneDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Shipping Zone</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="zoneDialog.data.countries == null
+              || zoneDialog.data.cost == null"
+            type="submit"
+            >Create Shipping Zone</q-btn
+          >
+
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+
+  <q-dialog v-model="shopDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="sendShopFormData" class="q-gutter-md">
+        <q-toggle
+        label="Activate shop"
+        color="primary"
+        v-model="shopDialog.data.activate"
+      ></q-toggle>
+        <q-select
+          filled
+          dense
+          multiple
+          :options="stalls"
+          label="Stalls"
+          v-model.trim="shopDialog.data.stalls"
+        ></q-select>
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="shopDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Relay</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="shopDialog.data.activate == null
+              || shopDialog.data.stalls == null"
+            type="submit"
+            >Launch</q-btn
+          >
+
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="stallDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="sendStallFormData" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="stallDialog.data.name"
+          label="Name"
+        ></q-input>
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="stallDialog.data.wallet"
+          :options="g.user.walletOptions"
+          label="Wallet *"
+        >
+        </q-select>
+        <div class="row">
+          <div class="col-5">
+            <q-btn unelevated color="primary">Generate keys</q-btn>
+          </div>
+          <div class="col-5">
+            <q-btn unelevated color="primary">Restore keys</q-btn>
+          </div>
+        </div>
+        <q-input
+          v-if="stallDialog.restorekeys"
+          filled
+          dense
+          v-model.trim="stallDialog.data.publickey"
+          label="Public Key"
+        ></q-input>
+        <q-input
+          v-if="stallDialog.restorekeys"
+          filled
+          dense
+          v-model.trim="stallDialog.data.privatekey"
+          label="Private Key"
+        ></q-input>
+        <q-select
+          :options="shippingZoneOptions"
+          filled
+          dense
+          multiple
+          v-model.trim="stallDialog.data.shippingzones"
+          label="Shipping Zones"
+        ></q-select>
+        <q-select
+          :options="relayOptions"
+          filled
+          dense
+          multiple
+          v-model.trim="stallDialog.data.relays"
+          label="Relays"
+        ></q-select>
+        <q-input
+          filled
+          dense
+          v-model.trim="stallDialog.data.name"
+          label="Custom relays (seperate by comma)"
+        ></q-input>
+        
+        <q-input
+          filled
+          dense
+          v-model.trim="stallDialog.data.nostrShops"
+          label="Stall public keys (seperate by comma)"
+        ></q-input>
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="stallDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Stall</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="stallDialog.data.countries == null
+              || stallDialog.data.cost == null"
+            type="submit"
+            >Create Stall</q-btn
+          >
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <q-btn unelevated color="primary" @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
+        >
+        <q-btn unelevated color="primary" @click="zoneDialog.show = true"
+          >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
+        >
+        <q-btn unelevated color="primary" @click="stallDialog.show = true"
+          >+ Stall
+          <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
+        >
+        <q-btn unelevated color="primary" @click="shopDialog.show = true"
+          >Launch frontend shop (not Nostr)
+          <q-tooltip> Makes a simple frontend shop for your stalls</q-tooltip></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">Orders</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportOrdersCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="orders"
+          row-key="id"
+          :columns="ordersTable.columns"
+          :pagination.sync="ordersTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </q-th>
+              <q-th auto-width></q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="shipOrder(props.row.id)"
+                  icon="add_shopping_cart"
+                  color="green"
+                >
+                  <q-tooltip> Product shipped? </q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteOrder(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </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">Products</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportProductsCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="products"
+          row-key="id"
+          :columns="productsTable.columns"
+          :pagination.sync="productsTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width></q-th>
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </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="add_shopping_cart"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  type="a"
+                  :href="props.row.wallet"
+                  target="_blank"
+                ></q-btn>
+                <q-tooltip> Link to pass to stall relay </q-tooltip>
+              </q-td>
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+              <q-td class="text-center" auto-width>
+                <img
+                  v-if="props.row.image"
+                  :src="props.row.image"
+                  style="height: 1.5em"
+                />
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openProductUpdateDialog(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteProduct(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </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">Stalls</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportStallsCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="stalls"
+          row-key="id"
+          :columns="stallTable.columns"
+          :pagination.sync="stallTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </q-th>
+              <q-th auto-width></q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openStallUpdateDialog(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteStall(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </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">Shipping Zones</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportZonesCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="zones"
+          row-key="id"
+          :columns="zonesTable.columns"
+          :pagination.sync="zonesTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </q-th>
+              <q-th auto-width></q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openZoneUpdateDialog(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteZone(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  <div class="col-12 col-md-4 col-lg-5 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <h6 class="text-subtitle1 q-my-none">
+          LNbits Diagon Alley Extension, powered by Nostr
+        </h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none">
+        <q-separator></q-separator>
+        <q-list> {% include "diagonalley/_api_docs.html" %} </q-list>
+      </q-card-section>
+    </q-card>
+    <q-card>
+      <q-card-section>
+        <h6 class="text-subtitle1 q-my-none">Messages (example)</h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none" >
+        <q-separator></q-separator>
+
+        <div class="row q-pa-md">
+          <div class="col-4">
+            <q-btn outline color="primary" size="md" style="height: 90px; width:90%"
+              >OrderID:87h87h<br/>KJBIBYBUYBUF90898....</q-btn
+            >
+            <q-btn outline color="primary" size="md" style="height: 90px; width:90%"
+              >OrderID:NIUHB7<br/>79867KJGJHGVFYFV....</q-btn
+            >
+          </div>
+          <div class="col-8">
+            <div style="height: 350px">
+            <q-chat-message
+              :text="['I have not received my Welsh Cakes']"
+              sent
+            ></q-chat-message>
+            <q-chat-message
+              :text="['Yep, its Brexit. They are stuck in customs. We will have to wait it out. I can offer a full refund?']"
+            ></q-chat-message>
+          </div>
+            <q-input ><template v-slot:after>
+              <q-btn round dense flat icon="send" />
+            </template></q-input>
+            
+        </div>
+      </q-card-section>
+    </q-card>
+  </div>
+  </div>
+</div>
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
+<script src="/diagonalley/static/js/index.js"></script>
+{% endblock %}
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
new file mode 100644
index 00000000..768bedfe
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -0,0 +1,9 @@
+<pre id="json"></pre>
+
+<script>
+  document.getElementById('json').innerHTML = JSON.stringify(
+    '{{ stall }}',
+    null,
+    2
+  )
+</script>
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
new file mode 100644
index 00000000..2deed72b
--- /dev/null
+++ b/lnbits/extensions/diagonalley/views.py
@@ -0,0 +1,44 @@
+
+from typing import List
+
+from fastapi import Request, WebSocket, WebSocketDisconnect
+from fastapi.params import Depends
+from fastapi.templating import Jinja2Templates
+from starlette.responses import HTMLResponse  # type: ignore
+
+from http import HTTPStatus
+import json
+from lnbits.decorators import check_user_exists, validate_uuids
+from lnbits.extensions.diagonalley import diagonalley_ext
+
+from .crud import (
+    create_diagonalley_product,
+    get_diagonalley_product,
+    get_diagonalley_products,
+    delete_diagonalley_product,
+    create_diagonalley_order,
+    get_diagonalley_order,
+    get_diagonalley_orders,
+    update_diagonalley_product,
+)
+
+
+@diagonalley_ext.get("/", response_class=HTMLResponse)
+@validate_uuids(["usr"], required=True)
+@check_user_exists(request: Request)
+async def index():
+    return await render_template("diagonalley/index.html", user=g.user)
+
+
+@diagonalley_ext.get("/<stall_id>", response_class=HTMLResponse)
+async def display(request: Request, stall_id):
+    product = await get_diagonalley_products(stall_id)
+    if not product:
+        abort(HTTPStatus.NOT_FOUND, "Stall does not exist.")
+
+    return await render_template(
+        "diagonalley/stall.html",
+        stall=json.dumps(
+            [product._asdict() for product in await get_diagonalley_products(stall_id)]
+        ),
+    )
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
new file mode 100644
index 00000000..4de2799e
--- /dev/null
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -0,0 +1,348 @@
+from http import HTTPStatus
+
+from fastapi import Request
+from fastapi.param_functions import Query
+from fastapi.params import Depends
+from starlette.exceptions import HTTPException
+
+from lnbits.core.crud import get_user
+from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+
+from . import diagonalley_ext
+from .crud import (
+    create_diagonalley_product,
+    get_diagonalley_product,
+    get_diagonalley_products,
+    delete_diagonalley_product,
+    create_diagonalley_zone,
+    update_diagonalley_zone,
+    get_diagonalley_zone,
+    get_diagonalley_zones,
+    delete_diagonalley_zone,
+    create_diagonalley_stall,
+    update_diagonalley_stall,
+    get_diagonalley_stall,
+    get_diagonalley_stalls,
+    delete_diagonalley_stall,
+    create_diagonalley_order,
+    get_diagonalley_order,
+    get_diagonalley_orders,
+    update_diagonalley_product,
+    delete_diagonalley_order,
+)
+from lnbits.core.services import create_invoice
+from base64 import urlsafe_b64encode
+from uuid import uuid4
+
+# from lnbits.db import open_ext_db
+
+from . import db
+from .models import Products, Orders, Stalls
+
+### Products
+
+@copilot_ext.get("/api/v1/copilot/{copilot_id}")
+async def api_copilot_retrieve(
+    req: Request,
+    copilot_id: str = Query(None),
+    wallet: WalletTypeInfo = Depends(get_key_type),
+):
+    copilot = await get_copilot(copilot_id)
+    if not copilot:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Copilot not found"
+        )
+    if not copilot.lnurl_toggle:
+        return copilot.dict()
+    return {**copilot.dict(), **{"lnurl": copilot.lnurl(req)}}
+
+
+@diagonalley_ext.get("/api/v1/products")
+async def api_diagonalley_products(
+    req: Request,
+    wallet: WalletTypeInfo = Depends(get_key_type),
+):
+    wallet_ids = [wallet.wallet.id]
+
+    if "all_stalls" in request.args:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+
+    return ([product._asdict() for product in await get_diagonalley_products(wallet_ids)])
+
+
+@diagonalley_ext.post("/api/v1/products")
+@diagonalley_ext.put("/api/v1/products/{product_id}")
+async def api_diagonalley_product_create(
+    data: Products, 
+    product_id=: str = Query(None), 
+    wallet: WalletTypeInfo = Depends(get_key_type)
+    ):
+
+    if product_id:
+        product = await get_diagonalley_product(product_id)
+
+        if not product:
+            return ({"message": "Withdraw product does not exist."}))
+
+        if product.wallet != wallet.wallet.id:
+            return ({"message": "Not your withdraw product."}))
+
+        product = await update_diagonalley_product(product_id, data)
+    else:
+        product = await create_diagonalley_product(wallet_id=wallet.wallet.id, data)
+
+    return ({**product._asdict()}))
+
+
+@diagonalley_ext.route("/api/v1/products/{product_id}")
+async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
+    product = await get_diagonalley_product(product_id)
+
+    if not product:
+        return ({"message": "Product does not exist."})
+
+    if product.wallet != wallet.wallet.id:
+        return ({"message": "Not your Diagon Alley."})
+
+    await delete_diagonalley_product(product_id)
+
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+# # # Shippingzones
+
+
+@diagonalley_ext.get("/api/v1/zones")
+async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
+    wallet_ids = [wallet.wallet.id]
+
+    if "all_wallets" in request.args:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+
+    return ([zone._asdict() for zone in await get_diagonalley_zones(wallet_ids)]))
+
+
+@diagonalley_ext.post("/api/v1/zones")
+@diagonalley_ext.put("/api/v1/zones/{zone_id}")
+async def api_diagonalley_zone_create(
+    data: Zones, 
+    zone_id: str = Query(None),  
+    wallet: WalletTypeInfo = Depends(get_key_type)
+    ):
+    if zone_id:
+        zone = await get_diagonalley_zone(zone_id)
+
+        if not zone:
+            return ({"message": "Zone does not exist."}))
+
+        if zone.wallet != walley.wallet.id:
+            return ({"message": "Not your record."}))
+
+        zone = await update_diagonalley_zone(zone_id, data)
+    else:
+        zone = await create_diagonalley_zone(wallet=wallet.wallet.id, data)
+
+    return ({**zone._asdict()}))
+
+
+@diagonalley_ext.delete("/api/v1/zones/{zone_id}")
+async def api_diagonalley_zone_delete(zone_id: str = Query(None),  wallet: WalletTypeInfo = Depends(require_admin_key)):
+    zone = await get_diagonalley_zone(zone_id)
+
+    if not zone:
+        return ({"message": "zone does not exist."})
+
+    if zone.wallet != wallet.wallet.id:
+        return ({"message": "Not your zone."})
+
+    await delete_diagonalley_zone(zone_id)
+
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+# # # Stalls
+
+
+@diagonalley_ext.get("/api/v1/stalls")
+async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type)):
+    wallet_ids = [wallet.wallet.id]
+
+    if "all_wallets" in request.args:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+
+    return ([stall._asdict() for stall in await get_diagonalley_stalls(wallet_ids)])
+
+
+@diagonalley_ext.post("/api/v1/stalls")
+@diagonalley_ext.put("/api/v1/stalls/{stall_id}")
+async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+
+    if stall_id:
+        stall = await get_diagonalley_stall(stall_id)
+
+        if not stall:
+            return ({"message": "Withdraw stall does not exist."}))
+
+        if stall.wallet != wallet.wallet.id:
+            return ({"message": "Not your withdraw stall."}))
+
+        stall = await update_diagonalley_stall(stall_id, data)
+    else:
+        stall = await create_diagonalley_stall(wallet_id=wallet.wallet.id, data)
+
+    return ({**stall._asdict()}))
+
+
+@diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
+async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)):
+    stall = await get_diagonalley_stall(stall_id)
+
+    if not stall:
+        return ({"message": "Stall does not exist."})
+
+    if stall.wallet != wallet.wallet.id:
+        return ({"message": "Not your Stall."})
+
+    await delete_diagonalley_stall(stall_id)
+
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+###Orders
+
+
+@diagonalley_ext.get("/api/v1/orders")
+async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type)):
+    wallet_ids = [wallet.wallet.id]
+
+    if "all_wallets" in request.args:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+
+    try:
+        return ([order._asdict() for order in await get_diagonalley_orders(wallet_ids)])
+    except:
+        return ({"message": "We could not retrieve the orders."}))
+
+
+@diagonalley_ext.post("/api/v1/orders")
+
+async def api_diagonalley_order_create(data: createOrders, wallet: WalletTypeInfo = Depends(get_key_type)):
+    order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data)
+    return ({**order._asdict()})
+
+
+@diagonalley_ext.delete("/api/v1/orders/{order_id}")
+async def api_diagonalley_order_delete(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+    order = await get_diagonalley_order(order_id)
+
+    if not order:
+        return ({"message": "Order does not exist."})
+
+    if order.wallet != wallet.wallet.id:
+        return ({"message": "Not your Order."})
+
+    await delete_diagonalley_order(order_id)
+
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+
+
+@diagonalley_ext.get("/api/v1/orders/paid/{order_id}")
+async def api_diagonalley_order_paid(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)):
+    await db.execute(
+        "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
+        (
+            True,
+            order_id,
+        ),
+    )
+    return "", HTTPStatus.OK
+
+
+@diagonalley_ext.get("/api/v1/orders/shipped/{order_id}")
+async def api_diagonalley_order_shipped(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+    await db.execute(
+        "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
+        (
+            True,
+            order_id,
+        ),
+    )
+    order = await db.fetchone(
+        "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
+    )
+
+    return ([order._asdict() for order in get_diagonalley_orders(order["wallet"])]))
+
+
+###List products based on stall id
+
+
+@diagonalley_ext.get("/api/v1/stall/products/{stall_id}")
+async def api_diagonalley_stall_products(stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+
+    rows = await db.fetchone(
+        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+    )
+    print(rows[1])
+    if not rows:
+        return ({"message": "Stall does not exist."})
+
+    products = db.fetchone(
+        "SELECT * FROM diagonalley.products WHERE wallet = ?", (rows[1],)
+    )
+    if not products:
+        return ({"message": "No products"})
+
+    return ([products._asdict() for products in await get_diagonalley_products(rows[1])])
+
+
+###Check a product has been shipped
+
+
+@diagonalley_ext.get("/api/v1/stall/checkshipped/{checking_id}")
+async def api_diagonalley_stall_checkshipped(checking_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+    rows = await db.fetchone(
+        "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
+    )
+    return ({"shipped": rows["shipped"]})
+
+
+###Place order
+
+
+@diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
+async def api_diagonalley_stall_order(data:createOrders, wallet: WalletTypeInfo = Depends(get_key_type)):
+    product = await get_diagonalley_product(data.id)
+    shipping = await get_diagonalley_stall(stall_id)
+
+    if data.shippingzone == 1:
+        shippingcost = shipping.zone1cost
+    else:
+        shippingcost = shipping.zone2cost
+
+    checking_id, payment_request = await create_invoice(
+        wallet_id=product.wallet,
+        amount=shippingcost + (data.quantity * product.price),
+        memo=data.id,
+    )
+    selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
+    await db.execute(
+        """
+            INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            """,
+        (
+            selling_id,
+            data.id,
+            product.wallet,
+            product.product,
+            data.quantity,
+            data.shippingzone,
+            data.address,
+            data.email,
+            checking_id,
+            False,
+            False,
+        ),
+    )
+    return ({"checking_id": checking_id, "payment_request": payment_request}))

From 5cc39930e5c0e0957596362dbbe95f16f475d3b4 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 27 Jan 2022 14:58:58 +0000
Subject: [PATCH 032/174] products

---
 lnbits/extensions/diagonalley/views_api.py | 75 ++++++++++++----------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 4de2799e..9df2c1d8 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -1,4 +1,6 @@
+from base64 import urlsafe_b64encode
 from http import HTTPStatus
+from uuid import uuid4
 
 from fastapi import Request
 from fastapi.param_functions import Query
@@ -6,41 +8,44 @@ from fastapi.params import Depends
 from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+from lnbits.core.services import create_invoice
+from lnbits.decorators import (
+    WalletTypeInfo,
+    api_check_wallet_key,
+    api_validate_post_request,
+    get_key_type,
+    require_admin_key,
+)
 
-from . import diagonalley_ext
+from . import db, diagonalley_ext
 from .crud import (
-    create_diagonalley_product,
-    get_diagonalley_product,
-    get_diagonalley_products,
-    delete_diagonalley_product,
-    create_diagonalley_zone,
-    update_diagonalley_zone,
-    get_diagonalley_zone,
-    get_diagonalley_zones,
-    delete_diagonalley_zone,
-    create_diagonalley_stall,
-    update_diagonalley_stall,
-    get_diagonalley_stall,
-    get_diagonalley_stalls,
-    delete_diagonalley_stall,
     create_diagonalley_order,
+    create_diagonalley_product,
+    create_diagonalley_stall,
+    create_diagonalley_zone,
+    delete_diagonalley_order,
+    delete_diagonalley_product,
+    delete_diagonalley_stall,
+    delete_diagonalley_zone,
     get_diagonalley_order,
     get_diagonalley_orders,
+    get_diagonalley_product,
+    get_diagonalley_products,
+    get_diagonalley_stall,
+    get_diagonalley_stalls,
+    get_diagonalley_zone,
+    get_diagonalley_zones,
     update_diagonalley_product,
-    delete_diagonalley_order,
+    update_diagonalley_stall,
+    update_diagonalley_zone,
 )
-from lnbits.core.services import create_invoice
-from base64 import urlsafe_b64encode
-from uuid import uuid4
+from .models import Orders, Products, Stalls
 
 # from lnbits.db import open_ext_db
 
-from . import db
-from .models import Products, Orders, Stalls
 
 ### Products
-
+"""
 @copilot_ext.get("/api/v1/copilot/{copilot_id}")
 async def api_copilot_retrieve(
     req: Request,
@@ -55,26 +60,27 @@ async def api_copilot_retrieve(
     if not copilot.lnurl_toggle:
         return copilot.dict()
     return {**copilot.dict(), **{"lnurl": copilot.lnurl(req)}}
-
+"""
 
 @diagonalley_ext.get("/api/v1/products")
 async def api_diagonalley_products(
     req: Request,
     wallet: WalletTypeInfo = Depends(get_key_type),
+    all_stalls: bool = Query(False)
 ):
     wallet_ids = [wallet.wallet.id]
 
-    if "all_stalls" in request.args:
+    if all_stalls:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([product._asdict() for product in await get_diagonalley_products(wallet_ids)])
+    return ([product.dict() for product in await get_diagonalley_products(wallet_ids)])
 
 
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
     data: Products, 
-    product_id=: str = Query(None), 
+    product_id: str = Query(None), 
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
 
@@ -82,19 +88,19 @@ async def api_diagonalley_product_create(
         product = await get_diagonalley_product(product_id)
 
         if not product:
-            return ({"message": "Withdraw product does not exist."}))
+            return ({"message": "Withdraw product does not exist."})
 
         if product.wallet != wallet.wallet.id:
-            return ({"message": "Not your withdraw product."}))
+            return ({"message": "Not your withdraw product."})
 
         product = await update_diagonalley_product(product_id, data)
     else:
         product = await create_diagonalley_product(wallet_id=wallet.wallet.id, data)
 
-    return ({**product._asdict()}))
+    return product.dict()
 
 
-@diagonalley_ext.route("/api/v1/products/{product_id}")
+@diagonalley_ext.delete("/api/v1/products/{product_id}")
 async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
     product = await get_diagonalley_product(product_id)
 
@@ -105,7 +111,6 @@ async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = D
         return ({"message": "Not your Diagon Alley."})
 
     await delete_diagonalley_product(product_id)
-
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
@@ -113,13 +118,13 @@ async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = D
 
 
 @diagonalley_ext.get("/api/v1/zones")
-async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
     wallet_ids = [wallet.wallet.id]
 
-    if "all_wallets" in request.args:
+    if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([zone._asdict() for zone in await get_diagonalley_zones(wallet_ids)]))
+    return ([zone.dict() for zone in await get_diagonalley_zones(wallet_ids)])
 
 
 @diagonalley_ext.post("/api/v1/zones")

From ebaf0c990f32cd545c40e1ae1c645b53a9cdd0bc Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 27 Jan 2022 15:26:55 +0000
Subject: [PATCH 033/174] zones

---
 lnbits/extensions/diagonalley/crud.py      | 63 +++++++++-------------
 lnbits/extensions/diagonalley/models.py    | 41 +++++++++-----
 lnbits/extensions/diagonalley/views_api.py | 26 +++++----
 3 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index c6ce8222..7dc02cd4 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -1,17 +1,17 @@
+import re
 from base64 import urlsafe_b64encode
-from uuid import uuid4
 from typing import List, Optional, Union
+from uuid import uuid4
 
-from lnbits.settings import WALLET
+import httpx
 
 # from lnbits.db import open_ext_db
 from lnbits.db import SQLITE
-from . import db
-from .models import Products, Orders, Stalls, Zones
-
-import httpx
 from lnbits.helpers import urlsafe_short_hash
-import re
+from lnbits.settings import WALLET
+
+from . import db
+from .models import Orders, Products, Stalls, Zones, createProduct, createZones
 
 regex = re.compile(
     r"^(?:http|ftp)s?://"  # http:// or https://
@@ -28,35 +28,27 @@ regex = re.compile(
 
 
 async def create_diagonalley_product(
-    *,
-    stall_id: str,
-    product: str,
-    categories: str,
-    description: str,
-    image: Optional[str] = None,
-    price: int,
-    quantity: int,
-    shippingzones: str,
+    data: createProduct
 ) -> Products:
-    returning = "" if db.type == SQLITE else "RETURNING ID"
-    method = db.execute if db.type == SQLITE else db.fetchone
+    # returning = "" if db.type == SQLITE else "RETURNING ID"
+    # method = db.execute if db.type == SQLITE else db.fetchone
     product_id = urlsafe_short_hash()
     # with open_ext_db("diagonalley") as db:
-    result = await (method)(
+    # result = await (method)(
+    await db.execute(
         f"""
-        INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity, shippingzones)
+        INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-        {returning}
         """,
         (
             product_id,
-            stall_id,
-            product,
-            categories,
-            description,
-            image,
-            price,
-            quantity,
+            data.stall,
+            data.product,
+            data.categories,
+            data.description,
+            data.image,
+            data.price,
+            data.quantity,
         ),
     )
     product = await get_diagonalley_product(product_id)
@@ -109,17 +101,11 @@ async def delete_diagonalley_product(product_id: str) -> None:
 
 
 async def create_diagonalley_zone(
-    *,
-    wallet: Optional[str] = None,
-    cost: Optional[int] = 0,
-    countries: Optional[str] = None,
+    wallet,
+    data: createZones
 ) -> Zones:
-
-    returning = "" if db.type == SQLITE else "RETURNING ID"
-    method = db.execute if db.type == SQLITE else db.fetchone
-
     zone_id = urlsafe_short_hash()
-    result = await (method)(
+    await db.execute(
         f"""
         INSERT INTO diagonalley.zones (
             id,
@@ -129,9 +115,8 @@ async def create_diagonalley_zone(
 
         )
         VALUES (?, ?, ?, ?)
-        {returning}
         """,
-        (zone_id, wallet, cost, countries),
+        (zone_id, wallet, data.cost, data.countries),
     )
 
     zone = await get_diagonalley_zone(zone_id)
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 0f2a1d78..bd667a2f 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -1,12 +1,15 @@
-from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
-from starlette.requests import Request
+import json
+from lib2to3.pytree import Base
+from sqlite3 import Row
+from typing import Dict, Optional
+from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+
 from fastapi.param_functions import Query
-from typing import Optional, Dict
-from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
-import json
-from sqlite3 import Row
+from starlette.requests import Request
+
+from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class Stalls(BaseModel):
@@ -25,23 +28,35 @@ class createStalls(BaseModel):
     relays: str = Query(None)
     shippingzones: str = Query(None)
 
-class Products(BaseModel):
-    id: str = Query(None)
+class createProduct(BaseModel):
     stall: str = Query(None)
     product: str = Query(None)
     categories: str = Query(None)
     description: str = Query(None)
     image: str = Query(None)
-    price: int = Query(0)
-    quantity: int = Query(0)
+    price: int = Query(0, ge=0)
+    quantity: int = Query(0, ge=0)
 
+class Products(BaseModel):
+    id: str
+    stall: str
+    product: str
+    categories: str
+    description: str
+    image: str
+    price: int
+    quantity: int
 
-class Zones(BaseModel):
-    id: str = Query(None)
-    wallet: str = Query(None)
+class createZones(BaseModel):
     cost: str = Query(None)
     countries: str = Query(None)
 
+class Zones(BaseModel):
+    id: str
+    wallet: str
+    cost: str
+    countries: str
+
 
 class Orders(BaseModel):
     id: str = Query(None)
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 9df2c1d8..1ad83936 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -39,7 +39,7 @@ from .crud import (
     update_diagonalley_stall,
     update_diagonalley_zone,
 )
-from .models import Orders, Products, Stalls
+from .models import Orders, Products, Stalls, Zones, createProduct, createZones
 
 # from lnbits.db import open_ext_db
 
@@ -79,7 +79,7 @@ async def api_diagonalley_products(
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
-    data: Products, 
+    data: createProduct, 
     product_id: str = Query(None), 
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
@@ -93,9 +93,9 @@ async def api_diagonalley_product_create(
         if product.wallet != wallet.wallet.id:
             return ({"message": "Not your withdraw product."})
 
-        product = await update_diagonalley_product(product_id, data)
+        product = await update_diagonalley_product(product_id, **data.dict())
     else:
-        product = await create_diagonalley_product(wallet_id=wallet.wallet.id, data)
+        product = await create_diagonalley_product(data=data)
 
     return product.dict()
 
@@ -126,11 +126,10 @@ async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type),
 
     return ([zone.dict() for zone in await get_diagonalley_zones(wallet_ids)])
 
-
 @diagonalley_ext.post("/api/v1/zones")
 @diagonalley_ext.put("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_create(
-    data: Zones, 
+    data: createZones, 
     zone_id: str = Query(None),  
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
@@ -138,20 +137,20 @@ async def api_diagonalley_zone_create(
         zone = await get_diagonalley_zone(zone_id)
 
         if not zone:
-            return ({"message": "Zone does not exist."}))
+            return ({"message": "Zone does not exist."})
 
-        if zone.wallet != walley.wallet.id:
-            return ({"message": "Not your record."}))
+        if zone.wallet != wallet.wallet.id:
+            return ({"message": "Not your record."})
 
-        zone = await update_diagonalley_zone(zone_id, data)
+        zone = await update_diagonalley_zone(zone_id, **data.dict())
     else:
-        zone = await create_diagonalley_zone(wallet=wallet.wallet.id, data)
+        zone = await create_diagonalley_zone(wallet=wallet.wallet.id, data=data)
 
-    return ({**zone._asdict()}))
+    return zone.dict()
 
 
 @diagonalley_ext.delete("/api/v1/zones/{zone_id}")
-async def api_diagonalley_zone_delete(zone_id: str = Query(None),  wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
     zone = await get_diagonalley_zone(zone_id)
 
     if not zone:
@@ -161,7 +160,6 @@ async def api_diagonalley_zone_delete(zone_id: str = Query(None),  wallet: Walle
         return ({"message": "Not your zone."})
 
     await delete_diagonalley_zone(zone_id)
-
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 

From 8b373021641674d7875afb6b002e7b26c7afae55 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 27 Jan 2022 16:18:12 +0000
Subject: [PATCH 034/174] stalls

---
 lnbits/extensions/diagonalley/crud.py      | 34 ++++++++++++----------
 lnbits/extensions/diagonalley/models.py    | 25 ++++++++--------
 lnbits/extensions/diagonalley/views_api.py | 29 +++++++++++-------
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 7dc02cd4..3b58b129 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -11,7 +11,15 @@ from lnbits.helpers import urlsafe_short_hash
 from lnbits.settings import WALLET
 
 from . import db
-from .models import Orders, Products, Stalls, Zones, createProduct, createZones
+from .models import (
+    Orders,
+    Products,
+    Stalls,
+    Zones,
+    createProduct,
+    createStalls,
+    createZones,
+)
 
 regex = re.compile(
     r"^(?:http|ftp)s?://"  # http:// or https://
@@ -185,20 +193,10 @@ async def delete_diagonalley_zone(zone_id: str) -> None:
 
 
 async def create_diagonalley_stall(
-    *,
-    wallet: str,
-    name: str,
-    publickey: str,
-    privatekey: str,
-    relays: str,
-    shippingzones: str,
+    data: createStalls
 ) -> Stalls:
-
-    returning = "" if db.type == SQLITE else "RETURNING ID"
-    method = db.execute if db.type == SQLITE else db.fetchone
-
     stall_id = urlsafe_short_hash()
-    result = await (method)(
+    await db.execute(
         f"""
         INSERT INTO diagonalley.stalls (
             id,
@@ -210,9 +208,15 @@ async def create_diagonalley_stall(
             shippingzones
         )
         VALUES (?, ?, ?, ?, ?, ?, ?)
-        {returning}
         """,
-        (stall_id, wallet, name, publickey, privatekey, relays, shippingzones),
+        (
+            stall_id,
+            data.wallet,
+            data.name,
+            data.publickey,
+            data.privatekey,
+            data.relays,
+            data.shippingzones),
     )
 
     stall = await get_diagonalley_stall(stall_id)
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index bd667a2f..4c674c8a 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -13,20 +13,21 @@ from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class Stalls(BaseModel):
-    id: str = Query(None)
-    wallet: str = Query(None)
-    name: str = Query(None)
-    publickey: str = Query(None)
-    privatekey: str = Query(None)
-    relays: str = Query(None)
+    id: str
+    wallet: str
+    name: str
+    publickey: str
+    privatekey: str
+    relays: str
+    shippingzones: str
 
 class createStalls(BaseModel):
-    wallet: str = Query(None)
-    name: str = Query(None)
-    publickey: str = Query(None)
-    privatekey: str = Query(None)
-    relays: str = Query(None)
-    shippingzones: str = Query(None)
+    wallet: str = Query(...)
+    name: str = Query(...)
+    publickey: str = Query(...)
+    privatekey: str = Query(...)
+    relays: str = Query(...)
+    shippingzones: str = Query(...)
 
 class createProduct(BaseModel):
     stall: str = Query(None)
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 1ad83936..ccac9b24 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -39,7 +39,15 @@ from .crud import (
     update_diagonalley_stall,
     update_diagonalley_zone,
 )
-from .models import Orders, Products, Stalls, Zones, createProduct, createZones
+from .models import (
+    Orders,
+    Products,
+    Stalls,
+    Zones,
+    createProduct,
+    createStalls,
+    createZones,
+)
 
 # from lnbits.db import open_ext_db
 
@@ -167,33 +175,33 @@ async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(
 
 
 @diagonalley_ext.get("/api/v1/stalls")
-async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
     wallet_ids = [wallet.wallet.id]
 
-    if "all_wallets" in request.args:
+    if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([stall._asdict() for stall in await get_diagonalley_stalls(wallet_ids)])
+    return ([stall.dict() for stall in await get_diagonalley_stalls(wallet_ids)])
 
 
 @diagonalley_ext.post("/api/v1/stalls")
 @diagonalley_ext.put("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_create(data: createStalls, stall_id = None, wallet: WalletTypeInfo = Depends(get_key_type)):
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
 
         if not stall:
-            return ({"message": "Withdraw stall does not exist."}))
+            return ({"message": "Withdraw stall does not exist."})
 
         if stall.wallet != wallet.wallet.id:
-            return ({"message": "Not your withdraw stall."}))
+            return ({"message": "Not your withdraw stall."})
 
-        stall = await update_diagonalley_stall(stall_id, data)
+        stall = await update_diagonalley_stall(stall_id, **data.dict())
     else:
-        stall = await create_diagonalley_stall(wallet_id=wallet.wallet.id, data)
+        stall = await create_diagonalley_stall(data=data)
 
-    return ({**stall._asdict()}))
+    return stall.dict()
 
 
 @diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
@@ -207,7 +215,6 @@ async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: Wall
         return ({"message": "Not your Stall."})
 
     await delete_diagonalley_stall(stall_id)
-
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 

From c41f6033be1066bae9f13f66d414a6bc07c3734b Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 28 Jan 2022 15:11:31 +0000
Subject: [PATCH 035/174] orders

---
 lnbits/extensions/diagonalley/crud.py      | 62 +++++++++-------------
 lnbits/extensions/diagonalley/models.py    | 28 ++++++----
 lnbits/extensions/diagonalley/views_api.py | 42 +++++++--------
 3 files changed, 65 insertions(+), 67 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 3b58b129..4cf14014 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -16,6 +16,7 @@ from .models import (
     Products,
     Stalls,
     Zones,
+    createOrder,
     createProduct,
     createStalls,
     createZones,
@@ -83,7 +84,7 @@ async def get_diagonalley_product(product_id: str) -> Optional[Products]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
     )
-    return Products.from_row(row) if row else None
+    return Products(**row) if row else None
 
 
 async def get_diagonalley_products(wallet_ids: Union[str, List[str]]) -> List[Products]:
@@ -98,7 +99,7 @@ async def get_diagonalley_products(wallet_ids: Union[str, List[str]]) -> List[Pr
         """,
         (*wallet_ids,),
     )
-    return [Products.from_row(row) for row in rows]
+    return [Products(**row) for row in rows]
 
 
 async def delete_diagonalley_product(product_id: str) -> None:
@@ -139,12 +140,12 @@ async def update_diagonalley_zone(zone_id: str, **kwargs) -> Optional[Zones]:
         (*kwargs.values(), zone_id),
     )
     row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
-    return Zones.from_row(row) if row else None
+    return Zones(**row) if row else None
 
 
 async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
     row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
-    return Zones.from_row(row) if row else None
+    return Zones(**row) if row else None
 
 
 async def get_diagonalley_zones(wallet_ids: Union[str, List[str]]) -> List[Zones]:
@@ -182,7 +183,7 @@ async def get_diagonalley_zones(wallet_ids: Union[str, List[str]]) -> List[Zones
     rows = await db.fetchall(
         f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
     )
-    return [Zones.from_row(row) for row in rows]
+    return [Zones(**row) for row in rows]
 
 
 async def delete_diagonalley_zone(zone_id: str) -> None:
@@ -233,7 +234,7 @@ async def update_diagonalley_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
-    return Stalls.from_row(row) if row else None
+    return Stalls(**row) if row else None
 
 
 async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
@@ -266,7 +267,7 @@ async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
-    return Stalls.from_row(row) if row else None
+    return Stalls(**row) if row else None
 
 
 async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
@@ -303,7 +304,7 @@ async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stal
     rows = await db.fetchall(
         f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
     )
-    return [Stalls.from_row(row) for row in rows]
+    return [Stalls(**row) for row in rows]
 
 
 async def delete_diagonalley_stall(stall_id: str) -> None:
@@ -314,47 +315,34 @@ async def delete_diagonalley_stall(stall_id: str) -> None:
 
 
 async def create_diagonalley_order(
-    *,
-    productid: str,
-    wallet: str,
-    product: str,
-    quantity: int,
-    shippingzone: str,
-    address: str,
-    email: str,
-    invoiceid: str,
-    paid: bool,
-    shipped: bool,
+    data: createOrder
 ) -> Orders:
-    returning = "" if db.type == SQLITE else "RETURNING ID"
-    method = db.execute if db.type == SQLITE else db.fetchone
 
     order_id = urlsafe_short_hash()
-    result = await (method)(
+    await db.execute(
         f"""
             INSERT INTO diagonalley.orders (id, productid, wallet, product,
             quantity, shippingzone, address, email, invoiceid, paid, shipped)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            {returning}
             """,
         (
             order_id,
-            productid,
-            wallet,
-            product,
-            quantity,
-            shippingzone,
-            address,
-            email,
-            invoiceid,
+            data.productid,
+            data.wallet,
+            data.product,
+            data.quantity,
+            data.shippingzone,
+            data.address,
+            data.email,
+            data.invoiceid,
             False,
             False,
         ),
     )
-    if db.type == SQLITE:
-        order_id = result._result_proxy.lastrowid
-    else:
-        order_id = result[0]
+    # if db.type == SQLITE:
+    #     order_id = result._result_proxy.lastrowid
+    # else:
+    #     order_id = result[0]
 
     link = await get_diagonalley_order(order_id)
     assert link, "Newly created link couldn't be retrieved"
@@ -365,7 +353,7 @@ async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
     )
-    return Orders.from_row(row) if row else None
+    return Orders(**row) if row else None
 
 
 async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
@@ -377,7 +365,7 @@ async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orde
         f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})", (*wallet_ids,)
     )
     #
-    return [Orders.from_row(row) for row in rows]
+    return [Orders(**row) for row in rows]
 
 
 async def delete_diagonalley_order(order_id: str) -> None:
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 4c674c8a..1a975e10 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -59,15 +59,25 @@ class Zones(BaseModel):
     countries: str
 
 
+class createOrder(BaseModel):
+    productid: str = Query(...)
+    stall: str = Query(...)
+    product: str = Query(...)
+    quantity: int = Query(..., ge=1)
+    shippingzone: int = Query(...)
+    address: str = Query(...)
+    email: str = Query(...)
+    invoiceid: str = Query(...)
+
 class Orders(BaseModel):
-    id: str = Query(None)
-    productid: str = Query(None)
-    stall: str = Query(None)
-    product: str = Query(None)
-    quantity: int = Query(0)
-    shippingzone: int = Query(0)
-    address: str = Query(None)
-    email: str = Query(None)
-    invoiceid: str = Query(None)
+    id: str
+    productid: str
+    stall: str
+    product: str
+    quantity: int
+    shippingzone: int
+    address: str
+    email: str
+    invoiceid: str
     paid: bool
     shipped: bool
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index ccac9b24..165d2a0c 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -44,6 +44,7 @@ from .models import (
     Products,
     Stalls,
     Zones,
+    createOrder,
     createProduct,
     createStalls,
     createZones,
@@ -87,8 +88,8 @@ async def api_diagonalley_products(
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
+    product_id, 
     data: createProduct, 
-    product_id: str = Query(None), 
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
 
@@ -186,7 +187,7 @@ async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type),
 
 @diagonalley_ext.post("/api/v1/stalls")
 @diagonalley_ext.put("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_create(data: createStalls, stall_id = None, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
@@ -222,23 +223,22 @@ async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: Wall
 
 
 @diagonalley_ext.get("/api/v1/orders")
-async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
     wallet_ids = [wallet.wallet.id]
 
-    if "all_wallets" in request.args:
+    if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
     try:
-        return ([order._asdict() for order in await get_diagonalley_orders(wallet_ids)])
+        return ([order.dict() for order in await get_diagonalley_orders(wallet_ids)])
     except:
-        return ({"message": "We could not retrieve the orders."}))
+        return ({"message": "We could not retrieve the orders."})
 
 
 @diagonalley_ext.post("/api/v1/orders")
-
-async def api_diagonalley_order_create(data: createOrders, wallet: WalletTypeInfo = Depends(get_key_type)):
-    order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data)
-    return ({**order._asdict()})
+async def api_diagonalley_order_create(data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)):
+    order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
+    return order.dict()
 
 
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
@@ -281,7 +281,7 @@ async def api_diagonalley_order_shipped(order_id: str = Query(None), wallet: Wal
         "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
     )
 
-    return ([order._asdict() for order in get_diagonalley_orders(order["wallet"])]))
+    return ([order.dict() for order in get_diagonalley_orders(order["wallet"])])
 
 
 ###List products based on stall id
@@ -303,14 +303,14 @@ async def api_diagonalley_stall_products(stall_id: str = Query(None), wallet: Wa
     if not products:
         return ({"message": "No products"})
 
-    return ([products._asdict() for products in await get_diagonalley_products(rows[1])])
+    return ([products.dict() for products in await get_diagonalley_products(rows[1])])
 
 
 ###Check a product has been shipped
 
 
 @diagonalley_ext.get("/api/v1/stall/checkshipped/{checking_id}")
-async def api_diagonalley_stall_checkshipped(checking_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_checkshipped(checking_id, wallet: WalletTypeInfo = Depends(get_key_type)):
     rows = await db.fetchone(
         "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
     )
@@ -321,19 +321,19 @@ async def api_diagonalley_stall_checkshipped(checking_id: str = Query(None), wal
 
 
 @diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
-async def api_diagonalley_stall_order(data:createOrders, wallet: WalletTypeInfo = Depends(get_key_type)):
-    product = await get_diagonalley_product(data.id)
+async def api_diagonalley_stall_order(stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)):
+    product = await get_diagonalley_product(data.productid)
     shipping = await get_diagonalley_stall(stall_id)
 
     if data.shippingzone == 1:
-        shippingcost = shipping.zone1cost
+        shippingcost = shipping.zone1cost #missing in model
     else:
-        shippingcost = shipping.zone2cost
+        shippingcost = shipping.zone2cost #missing in model
 
     checking_id, payment_request = await create_invoice(
         wallet_id=product.wallet,
         amount=shippingcost + (data.quantity * product.price),
-        memo=data.id,
+        memo=shipping.wallet,
     )
     selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
     await db.execute(
@@ -343,8 +343,8 @@ async def api_diagonalley_stall_order(data:createOrders, wallet: WalletTypeInfo
             """,
         (
             selling_id,
-            data.id,
-            product.wallet,
+            data.productid,
+            product.wallet, #doesn't exist in model
             product.product,
             data.quantity,
             data.shippingzone,
@@ -355,4 +355,4 @@ async def api_diagonalley_stall_order(data:createOrders, wallet: WalletTypeInfo
             False,
         ),
     )
-    return ({"checking_id": checking_id, "payment_request": payment_request}))
+    return ({"checking_id": checking_id, "payment_request": payment_request})

From a55dd18528ef5a91782352972d6c59d02d5c46c9 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 28 Jan 2022 16:22:54 +0000
Subject: [PATCH 036/174] UI fires up

---
 lnbits/extensions/diagonalley/__init__.py  | 35 +++++++++++---
 lnbits/extensions/diagonalley/tasks.py     |  6 +--
 lnbits/extensions/diagonalley/views.py     | 55 +++++++++-------------
 lnbits/extensions/diagonalley/views_api.py |  8 +---
 4 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index 720c55c8..cab65685 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -1,16 +1,37 @@
-from quart import Blueprint
+import asyncio
+
+from fastapi import APIRouter
+from fastapi.staticfiles import StaticFiles
+
 from lnbits.db import Database
+from lnbits.helpers import template_renderer
+from lnbits.tasks import catch_everything_and_restart
 
 db = Database("ext_diagonalley")
 
-diagonalley_ext: Blueprint = Blueprint(
-    "diagonalley", __name__, static_folder="static", template_folder="templates"
+diagonalley_static_files = [
+    {
+        "path": "/diagonalley/static",
+        "app": StaticFiles(directory="lnbits/extensions/diagonalley/static"),
+        "name": "diagonalley_static",
+    }
+]
+
+diagonalley_ext: APIRouter = APIRouter(
+    prefix="/diagonalley", tags=["diagonalley"]
+    # "diagonalley", __name__, static_folder="static", template_folder="templates"
 )
 
-from .views_api import *  # noqa
+def diagonalley_renderer():
+    return template_renderer(["lnbits/extensions/diagonalley/templates"])
+
+
+from .tasks import wait_for_paid_invoices
 from .views import *  # noqa
+from .views_api import *  # noqa
 
-from .tasks import register_listeners
-from lnbits.tasks import record_async
 
-diagonalley_ext.record(record_async(register_listeners))
+def diagonalley_start():
+    loop = asyncio.get_event_loop()
+    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
+
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/diagonalley/tasks.py
index 3fee63d9..bcbb7025 100644
--- a/lnbits/extensions/diagonalley/tasks.py
+++ b/lnbits/extensions/diagonalley/tasks.py
@@ -3,8 +3,6 @@ import asyncio
 from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
 
-from .crud import get_ticket, set_ticket_paid
-
 
 async def wait_for_paid_invoices():
     invoice_queue = asyncio.Queue()
@@ -16,6 +14,7 @@ async def wait_for_paid_invoices():
 
 
 async def on_invoice_paid(payment: Payment) -> None:
+    """
     if "lnticket" != payment.extra.get("tag"):
         # not a lnticket invoice
         return
@@ -26,4 +25,5 @@ async def on_invoice_paid(payment: Payment) -> None:
         return
 
     await payment.set_pending(False)
-    await set_ticket_paid(payment.payment_hash)
\ No newline at end of file
+    await set_ticket_paid(payment.payment_hash)
+    """
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 2deed72b..ae0899ca 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -1,44 +1,35 @@
 
-from typing import List
-
-from fastapi import Request, WebSocket, WebSocketDisconnect
-from fastapi.params import Depends
-from fastapi.templating import Jinja2Templates
-from starlette.responses import HTMLResponse  # type: ignore
-
 from http import HTTPStatus
-import json
-from lnbits.decorators import check_user_exists, validate_uuids
-from lnbits.extensions.diagonalley import diagonalley_ext
 
-from .crud import (
-    create_diagonalley_product,
-    get_diagonalley_product,
-    get_diagonalley_products,
-    delete_diagonalley_product,
-    create_diagonalley_order,
-    get_diagonalley_order,
-    get_diagonalley_orders,
-    update_diagonalley_product,
-)
+from fastapi import Request
+from fastapi.params import Depends
+from fastapi.templating import Jinja2Templates
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
 
+from lnbits.core.models import User
+from lnbits.decorators import check_user_exists  # type: ignore
+from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
+
+from .crud import get_diagonalley_products
+
+templates = Jinja2Templates(directory="templates")
 
 @diagonalley_ext.get("/", response_class=HTMLResponse)
-@validate_uuids(["usr"], required=True)
-@check_user_exists(request: Request)
-async def index():
-    return await render_template("diagonalley/index.html", user=g.user)
+async def index(request: Request, user: User = Depends(check_user_exists)):
+    return diagonalley_renderer().TemplateResponse(
+        "diagonalley/index.html", {"request": request, "user": user.dict()}
+    )
 
-
-@diagonalley_ext.get("/<stall_id>", response_class=HTMLResponse)
+@diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
     product = await get_diagonalley_products(stall_id)
+    
     if not product:
-        abort(HTTPStatus.NOT_FOUND, "Stall does not exist.")
-
-    return await render_template(
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
+        )
+    return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
-        stall=json.dumps(
-            [product._asdict() for product in await get_diagonalley_products(stall_id)]
-        ),
+        {"stall": [product.dict() for product in await get_diagonalley_products(stall_id)]}
     )
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 165d2a0c..43232841 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -9,13 +9,7 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
-from lnbits.decorators import (
-    WalletTypeInfo,
-    api_check_wallet_key,
-    api_validate_post_request,
-    get_key_type,
-    require_admin_key,
-)
+from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
 
 from . import db, diagonalley_ext
 from .crud import (

From 80a5d26dce583e1b10d104dde9554576dadb85a5 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 3 Feb 2022 21:19:24 +0000
Subject: [PATCH 037/174] Message ui working

---
 .../extensions/diagonalley/static/js/index.js | 83 ++++++++++++-------
 .../templates/diagonalley/index.html          | 47 ++++++-----
 2 files changed, 78 insertions(+), 52 deletions(-)

diff --git a/lnbits/extensions/diagonalley/static/js/index.js b/lnbits/extensions/diagonalley/static/js/index.js
index 1a25edaa..af81db2a 100644
--- a/lnbits/extensions/diagonalley/static/js/index.js
+++ b/lnbits/extensions/diagonalley/static/js/index.js
@@ -2,7 +2,24 @@
 
 Vue.component(VueQrcode.name, VueQrcode)
 
-const pica = window.pica()
+//const pica = window.pica()
+
+var mapStalls = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapProducts = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapZone = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapOrders = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
 
 new Vue({
   el: '#vue',
@@ -13,6 +30,9 @@ new Vue({
       orders: [],
       stalls: [],
       zones: [],
+      customerKeys: [],
+      customerKey: '',
+      customerMessages: {},
       shippedModel: false,
       shippingZoneOptions: [
         'Australia',
@@ -64,7 +84,8 @@ new Vue({
         'Groceries (Food and Drink)',
         'Technology (Phones and Computers)',
         'Home (furniture and accessories)',
-        'Gifts (flowers, cards, etc)'
+        'Gifts (flowers, cards, etc)',
+        'Adult'
       ],
       relayOptions: [
         'wss://nostr-relay.herokuapp.com/ws',
@@ -244,6 +265,17 @@ new Vue({
     }
   },
   methods: {
+    ////////////////////////////////////////
+    ///////////SUPPORT MESSAGES/////////////
+    ////////////////////////////////////////
+    getMessages: function (customerKey) {
+      var self = this
+      console.log('fuck')
+      messages = []
+      messages.push(['in', 'blah blah'])
+      messages.push(['out', 'blah blah'])
+      self.customerMessages = messages
+    },
     ////////////////////////////////////////
     ////////////////STALLS//////////////////
     ////////////////////////////////////////
@@ -256,10 +288,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.stalls = response.data.map(function (obj) {
-            console.log(obj)
-            return mapDiagonAlley(obj)
-          })
+          self.stalls.push(mapStalls(response.data))
         })
     },
     openStallUpdateDialog: function (linkId) {
@@ -302,7 +331,7 @@ new Vue({
           self.stalls = _.reject(self.stalls, function (obj) {
             return obj.id == data.id
           })
-          self.stalls.push(mapDiagonAlley(response.data))
+          self.stalls.push(mapStalls(response.data))
           self.stallDialog.show = false
           self.stallDialog.data = {}
           data = {}
@@ -323,7 +352,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.stalls.push(mapDiagonAlley(response.data))
+          self.stalls.push(mapStalls(response.data))
           self.stallDialog.show = false
           self.stallDialog.data = {}
           data = {}
@@ -371,9 +400,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.products = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.products.push(mapProducts(response.data))
         })
     },
     openProductUpdateDialog: function (linkId) {
@@ -450,7 +477,7 @@ new Vue({
           self.products = _.reject(self.products, function (obj) {
             return obj.id == data.id
           })
-          self.products.push(mapDiagonAlley(response.data))
+          self.products.push(mapProducts(response.data))
           self.productDialog.show = false
           self.productDialog.data = {}
         })
@@ -470,7 +497,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.products.push(mapDiagonAlley(response.data))
+          self.products.push(mapProducts(response.data))
           self.productDialog.show = false
           self.productDialog.data = {}
         })
@@ -517,9 +544,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.zones = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.zones.push(mapZone(response.data))
         })
     },
     openZoneUpdateDialog: function (linkId) {
@@ -559,7 +584,7 @@ new Vue({
           self.zones = _.reject(self.zones, function (obj) {
             return obj.id == data.id
           })
-          self.zones.push(mapDiagonAlley(response.data))
+          self.zones.push(mapZone(response.data))
           self.zoneDialog.show = false
           self.zoneDialog.data = {}
           data = {}
@@ -580,7 +605,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.zones.push(mapDiagonAlley(response.data))
+          self.zones.push(mapZone(response.data))
           self.zoneDialog.show = false
           self.zoneDialog.data = {}
           data = {}
@@ -628,9 +653,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.shops = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.shops.push(mapShops(response.data))
         })
     },
     openShopUpdateDialog: function (linkId) {
@@ -670,7 +693,7 @@ new Vue({
           self.shops = _.reject(self.shops, function (obj) {
             return obj.id == data.id
           })
-          self.shops.push(mapDiagonAlley(response.data))
+          self.shops.push(mapShops(response.data))
           self.shopDialog.show = false
           self.shopDialog.data = {}
           data = {}
@@ -692,7 +715,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.shops.push(mapDiagonAlley(response.data))
+          self.shops.push(mapShops(response.data))
           self.shopDialog.show = false
           self.shopDialog.data = {}
           data = {}
@@ -740,9 +763,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.orders = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.orders.push(mapOrders(response.data))
         })
     },
     createOrder: function () {
@@ -763,7 +784,7 @@ new Vue({
           data
         )
         .then(function (response) {
-          self.orders.push(mapDiagonAlley(response.data))
+          self.orders.push(mapOrders(response.data))
           self.orderDialog.show = false
           self.orderDialog.data = {}
         })
@@ -804,9 +825,7 @@ new Vue({
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          self.orders = response.data.map(function (obj) {
-            return mapDiagonAlley(obj)
-          })
+          self.orders.push(mapOrders(response.data))
         })
     },
     exportOrdersCSV: function () {
@@ -819,6 +838,10 @@ new Vue({
       this.getProducts()
       this.getZones()
       this.getOrders()
+      this.customerKeys = [
+        'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
+        'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
+      ]
     }
   }
 })
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 98405f6d..a89c8b5e 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -594,34 +594,37 @@
     </q-card>
     <q-card>
       <q-card-section>
-        <h6 class="text-subtitle1 q-my-none">Messages (example)</h6>
+        <h6 class="text-subtitle1 q-my-none">Messages</h6>
       </q-card-section>
       <q-card-section class="q-pa-none" >
         <q-separator></q-separator>
 
-        <div class="row q-pa-md">
-          <div class="col-4">
-            <q-btn outline color="primary" size="md" style="height: 90px; width:90%"
-              >OrderID:87h87h<br/>KJBIBYBUYBUF90898....</q-btn
-            >
-            <q-btn outline color="primary" size="md" style="height: 90px; width:90%"
-              >OrderID:NIUHB7<br/>79867KJGJHGVFYFV....</q-btn
-            >
+        <div class="column q-ma-md q-pb-lg" 
+         style="height: 350px">
+          <div class="col q-pb-md">
+            <q-select v-model="customerKey" style="width: 80%;"
+        :options="customerKeys" label="Customers" @input="getMessages(customerKey)"></q-select>
           </div>
-          <div class="col-8">
-            <div style="height: 350px">
-            <q-chat-message
-              :text="['I have not received my Welsh Cakes']"
-              sent
-            ></q-chat-message>
-            <q-chat-message
-              :text="['Yep, its Brexit. They are stuck in customs. We will have to wait it out. I can offer a full refund?']"
-            ></q-chat-message>
+          <div class="col-8 q-px-md">
+            <div v-for="message in customerMessages">
+              <q-chat-message
+                v-if="message[0] == 'out'"
+                :text="[message[1]]"
+                sent
+              ></q-chat-message>
+              <q-chat-message
+                v-else
+                :text="[message[1]]"
+              ></q-chat-message>
+          </div>
+          </div>
+          <div class="col on-right	" style="width: 90%">
+            <q-input >
+              <template v-slot:after>
+                <q-btn round dense flat icon="send" />
+              </template>
+            </q-input>
           </div>
-            <q-input ><template v-slot:after>
-              <q-btn round dense flat icon="send" />
-            </template></q-input>
-            
         </div>
       </q-card-section>
     </q-card>

From 1988a9d5d769ed1d2fc72471cb790ec0b4f2fefd Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 3 Feb 2022 22:30:53 +0000
Subject: [PATCH 038/174] Added error messages

---
 lnbits/extensions/diagonalley/static/js/index.js    |  6 ++++++
 .../diagonalley/templates/diagonalley/index.html    | 13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/diagonalley/static/js/index.js b/lnbits/extensions/diagonalley/static/js/index.js
index af81db2a..d101bfcf 100644
--- a/lnbits/extensions/diagonalley/static/js/index.js
+++ b/lnbits/extensions/diagonalley/static/js/index.js
@@ -265,6 +265,12 @@ new Vue({
     }
   },
   methods: {
+    errorMessage: function (error) {
+      this.$q.notify({
+        color: 'primary',
+        message: error
+      })
+    },
     ////////////////////////////////////////
     ///////////SUPPORT MESSAGES/////////////
     ////////////////////////////////////////
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index a89c8b5e..d14d7cee 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -300,13 +300,20 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="primary" @click="productDialog.show = true"
+        <q-btn unelevated v-if="stalls.length === 0" color="primary" @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
+        >
+        <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated color="primary" @click="stallDialog.show = true"
+        <q-btn unelevated v-if="zones.length === 0" color="primary" @click="stallDialog.show = true"
+          >+ Stall
+          <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
+        >
+        <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s).')"
           >+ Stall
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
@@ -618,7 +625,7 @@
               ></q-chat-message>
           </div>
           </div>
-          <div class="col on-right	" style="width: 90%">
+          <div class="col on-right" style="width: 90%">
             <q-input >
               <template v-slot:after>
                 <q-btn round dense flat icon="send" />

From 40fd894cced11135332b187939a52f787bcd1fab Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Fri, 4 Feb 2022 13:05:48 +0000
Subject: [PATCH 039/174] Zones are saving/updating

---
 lnbits/extensions/diagonalley/__init__.py     |  11 +-
 lnbits/extensions/diagonalley/crud.py         | 116 +--
 lnbits/extensions/diagonalley/migrations.py   |   8 +-
 lnbits/extensions/diagonalley/models.py       |   7 +-
 .../extensions/diagonalley/static/js/index.js | 853 -----------------
 .../templates/diagonalley/index.html          | 895 +++++++++++++++++-
 lnbits/extensions/diagonalley/views_api.py    |  40 +-
 7 files changed, 924 insertions(+), 1006 deletions(-)
 delete mode 100644 lnbits/extensions/diagonalley/static/js/index.js

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index cab65685..388c08db 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -9,17 +9,9 @@ from lnbits.tasks import catch_everything_and_restart
 
 db = Database("ext_diagonalley")
 
-diagonalley_static_files = [
-    {
-        "path": "/diagonalley/static",
-        "app": StaticFiles(directory="lnbits/extensions/diagonalley/static"),
-        "name": "diagonalley_static",
-    }
-]
 
 diagonalley_ext: APIRouter = APIRouter(
     prefix="/diagonalley", tags=["diagonalley"]
-    # "diagonalley", __name__, static_folder="static", template_folder="templates"
 )
 
 def diagonalley_renderer():
@@ -33,5 +25,4 @@ from .views_api import *  # noqa
 
 def diagonalley_start():
     loop = asyncio.get_event_loop()
-    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
-
+    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
\ No newline at end of file
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 4cf14014..d2df427c 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -22,28 +22,12 @@ from .models import (
     createZones,
 )
 
-regex = re.compile(
-    r"^(?:http|ftp)s?://"  # http:// or https://
-    r"(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|"
-    r"localhost|"
-    r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})"
-    r"(?::\d+)?"
-    r"(?:/?|[/?]\S+)$",
-    re.IGNORECASE,
-)
-
-
 ###Products
 
-
 async def create_diagonalley_product(
     data: createProduct
 ) -> Products:
-    # returning = "" if db.type == SQLITE else "RETURNING ID"
-    # method = db.execute if db.type == SQLITE else db.fetchone
     product_id = urlsafe_short_hash()
-    # with open_ext_db("diagonalley") as db:
-    # result = await (method)(
     await db.execute(
         f"""
         INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity)
@@ -110,7 +94,7 @@ async def delete_diagonalley_product(product_id: str) -> None:
 
 
 async def create_diagonalley_zone(
-    wallet,
+    user,
     data: createZones
 ) -> Zones:
     zone_id = urlsafe_short_hash()
@@ -118,14 +102,14 @@ async def create_diagonalley_zone(
         f"""
         INSERT INTO diagonalley.zones (
             id,
-            wallet,
+            user,
             cost,
             countries
 
         )
         VALUES (?, ?, ?, ?)
         """,
-        (zone_id, wallet, data.cost, data.countries),
+        (zone_id, user, data.cost, data.countries.lower()),
     )
 
     zone = await get_diagonalley_zone(zone_id)
@@ -148,41 +132,8 @@ async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
     return Zones(**row) if row else None
 
 
-async def get_diagonalley_zones(wallet_ids: Union[str, List[str]]) -> List[Zones]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
-        print(wallet_ids)
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
-    )
-
-    for r in rows:
-        try:
-            x = httpx.get(r["zoneaddress"] + "/" + r["ratingkey"])
-            if x.status_code == 200:
-                await db.execute(
-                    "UPDATE diagonalley.zones SET online = ? WHERE id = ?",
-                    (
-                        True,
-                        r["id"],
-                    ),
-                )
-            else:
-                await db.execute(
-                    "UPDATE diagonalley.zones SET online = ? WHERE id = ?",
-                    (
-                        False,
-                        r["id"],
-                    ),
-                )
-        except:
-            print("An exception occurred")
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.zones WHERE wallet IN ({q})", (*wallet_ids,)
-    )
+async def get_diagonalley_zones(user: str) -> List[Zones]:
+    rows = await db.fetchall("SELECT * FROM diagonalley.zones WHERE user = ?", (user,))
     return [Zones(**row) for row in rows]
 
 
@@ -217,7 +168,7 @@ async def create_diagonalley_stall(
             data.publickey,
             data.privatekey,
             data.relays,
-            data.shippingzones),
+            repr(data.shippingzones)),
     )
 
     stall = await get_diagonalley_stall(stall_id)
@@ -238,32 +189,6 @@ async def update_diagonalley_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
 
 
 async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
-    roww = await db.fetchone(
-        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
-    )
-
-    try:
-        x = httpx.get(roww["stalladdress"] + "/" + roww["ratingkey"])
-        if x.status_code == 200:
-            await db.execute(
-                "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
-                (
-                    True,
-                    stall_id,
-                ),
-            )
-        else:
-            await db.execute(
-                "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
-                (
-                    False,
-                    stall_id,
-                ),
-            )
-    except:
-        print("An exception occurred")
-
-    # with open_ext_db("diagonalley") as db:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
@@ -271,35 +196,6 @@ async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
 
 
 async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
-    )
-
-    for r in rows:
-        try:
-            x = httpx.get(r["stalladdress"] + "/" + r["ratingkey"])
-            if x.status_code == 200:
-                await db.execute(
-                    "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
-                    (
-                        True,
-                        r["id"],
-                    ),
-                )
-            else:
-                await db.execute(
-                    "UPDATE diagonalley.stalls SET online = ? WHERE id = ?",
-                    (
-                        False,
-                        r["id"],
-                    ),
-                )
-        except:
-            print("An exception occurred")
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
         f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 1523f398..29a84419 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -28,7 +28,8 @@ async def m001_initial(db):
             name TEXT NOT NULL,
             publickey TEXT NOT NULL,
             privatekey TEXT NOT NULL,
-            relays TEXT NOT NULL
+            relays TEXT NOT NULL,
+            shippingzones TEXT NOT NULL
         );
     """
     )
@@ -40,7 +41,7 @@ async def m001_initial(db):
         """
         CREATE TABLE diagonalley.zones (
             id TEXT PRIMARY KEY,
-            wallet TEXT NOT NULL,
+            user TEXT NOT NULL,
             cost TEXT NOT NULL,
             countries TEXT NOT NULL
         );
@@ -55,7 +56,8 @@ async def m001_initial(db):
         CREATE TABLE diagonalley.orders (
             id TEXT PRIMARY KEY,
             productid TEXT NOT NULL,
-            wallet TEXT NOT NULL,
+            usr TEXT NOT NULL,
+            pubkey TEXT NOT NULL,
             product TEXT NOT NULL,
             quantity INTEGER NOT NULL,
             shippingzone INTEGER NOT NULL,
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 1a975e10..743c2068 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -49,13 +49,13 @@ class Products(BaseModel):
     quantity: int
 
 class createZones(BaseModel):
-    cost: str = Query(None)
+    cost: int = Query(0, ge=0)
     countries: str = Query(None)
 
 class Zones(BaseModel):
     id: str
-    wallet: str
-    cost: str
+    user: str
+    cost: int
     countries: str
 
 
@@ -73,6 +73,7 @@ class Orders(BaseModel):
     id: str
     productid: str
     stall: str
+    pubkey: str
     product: str
     quantity: int
     shippingzone: int
diff --git a/lnbits/extensions/diagonalley/static/js/index.js b/lnbits/extensions/diagonalley/static/js/index.js
deleted file mode 100644
index d101bfcf..00000000
--- a/lnbits/extensions/diagonalley/static/js/index.js
+++ /dev/null
@@ -1,853 +0,0 @@
-/* globals Quasar, Vue, _, VueQrcode, windowMixin, LNbits, LOCALE */
-
-Vue.component(VueQrcode.name, VueQrcode)
-
-//const pica = window.pica()
-
-var mapStalls = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-var mapProducts = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-var mapZone = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-var mapOrders = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-
-new Vue({
-  el: '#vue',
-  mixins: [windowMixin],
-  data: function () {
-    return {
-      products: [],
-      orders: [],
-      stalls: [],
-      zones: [],
-      customerKeys: [],
-      customerKey: '',
-      customerMessages: {},
-      shippedModel: false,
-      shippingZoneOptions: [
-        'Australia',
-        'Austria',
-        'Belgium',
-        'Brazil',
-        'Canada',
-        'Denmark',
-        'Finland',
-        'France*',
-        'Germany',
-        'Greece',
-        'Hong Kong',
-        'Hungary',
-        'Ireland',
-        'Indonesia',
-        'Israel',
-        'Italy',
-        'Japan',
-        'Kazakhstan',
-        'Korea',
-        'Luxembourg',
-        'Malaysia',
-        'Mexico',
-        'Netherlands',
-        'New Zealand',
-        'Norway',
-        'Poland',
-        'Portugal',
-        'Russia',
-        'Saudi Arabia',
-        'Singapore',
-        'Spain',
-        'Sweden',
-        'Switzerland',
-        'Thailand',
-        'Turkey',
-        'Ukraine',
-        'United Kingdom**',
-        'United States***',
-        'Vietnam',
-        'China'
-      ],
-      categories: [
-        'Fashion (clothing and accessories)',
-        'Health (and beauty)',
-        'Toys (and baby equipment)',
-        'Media (Books and CDs)',
-        'Groceries (Food and Drink)',
-        'Technology (Phones and Computers)',
-        'Home (furniture and accessories)',
-        'Gifts (flowers, cards, etc)',
-        'Adult'
-      ],
-      relayOptions: [
-        'wss://nostr-relay.herokuapp.com/ws',
-        'wss://nostr-relay.bigsun.xyz/ws',
-        'wss://freedom-relay.herokuapp.com/ws'
-      ],
-      label: '',
-      ordersTable: {
-        columns: [
-          {
-            name: 'product',
-            align: 'left',
-            label: 'Product',
-            field: 'product'
-          },
-          {
-            name: 'quantity',
-            align: 'left',
-            label: 'Quantity',
-            field: 'quantity'
-          },
-          {
-            name: 'address',
-            align: 'left',
-            label: 'Address',
-            field: 'address'
-          },
-          {
-            name: 'invoiceid',
-            align: 'left',
-            label: 'InvoiceID',
-            field: 'invoiceid'
-          },
-          {name: 'paid', align: 'left', label: 'Paid', field: 'paid'},
-          {name: 'shipped', align: 'left', label: 'Shipped', field: 'shipped'}
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      productsTable: {
-        columns: [
-          {
-            name: 'stall',
-            align: 'left',
-            label: 'Stall',
-            field: 'stall'
-          },
-          {
-            name: 'product',
-            align: 'left',
-            label: 'Product',
-            field: 'product'
-          },
-          {
-            name: 'description',
-            align: 'left',
-            label: 'Description',
-            field: 'description'
-          },
-          {
-            name: 'categories',
-            align: 'left',
-            label: 'Categories',
-            field: 'categories'
-          },
-          {name: 'price', align: 'left', label: 'Price', field: 'price'},
-          {
-            name: 'quantity',
-            align: 'left',
-            label: 'Quantity',
-            field: 'quantity'
-          },
-          {name: 'id', align: 'left', label: 'ID', field: 'id'}
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      stallTable: {
-        columns: [
-          {
-            name: 'id',
-            align: 'left',
-            label: 'ID',
-            field: 'id'
-          },
-          {
-            name: 'name',
-            align: 'left',
-            label: 'Name',
-            field: 'name'
-          },
-          {
-            name: 'wallet',
-            align: 'left',
-            label: 'Wallet',
-            field: 'wallet'
-          },
-          {
-            name: 'publickey',
-            align: 'left',
-            label: 'Public key',
-            field: 'publickey'
-          },
-          {
-            name: 'privatekey',
-            align: 'left',
-            label: 'Private key',
-            field: 'privatekey'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      zonesTable: {
-        columns: [
-          {
-            name: 'id',
-            align: 'left',
-            label: 'ID',
-            field: 'id'
-          },
-          {
-            name: 'countries',
-            align: 'left',
-            label: 'Countries',
-            field: 'countries'
-          },
-          {
-            name: 'cost',
-            align: 'left',
-            label: 'Cost',
-            field: 'cost'
-          }
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      productDialog: {
-        show: false,
-        data: {}
-      },
-      stallDialog: {
-        show: false,
-        data: {}
-      },
-      zoneDialog: {
-        show: false,
-        data: {}
-      },
-      shopDialog: {
-        show: false,
-        data: {activate: false}
-      },
-      orderDialog: {
-        show: false,
-        data: {}
-      },
-      relayDialog: {
-        show: false,
-        data: {}
-      }
-    }
-  },
-  computed: {
-    categoryOther: function () {
-      cats = trim(this.productDialog.data.categories.split(','))
-      for (let i = 0; i < cats.length; i++) {
-        if (cats[i] == 'Others') {
-          return true
-        }
-      }
-      return false
-    }
-  },
-  methods: {
-    errorMessage: function (error) {
-      this.$q.notify({
-        color: 'primary',
-        message: error
-      })
-    },
-    ////////////////////////////////////////
-    ///////////SUPPORT MESSAGES/////////////
-    ////////////////////////////////////////
-    getMessages: function (customerKey) {
-      var self = this
-      console.log('fuck')
-      messages = []
-      messages.push(['in', 'blah blah'])
-      messages.push(['out', 'blah blah'])
-      self.customerMessages = messages
-    },
-    ////////////////////////////////////////
-    ////////////////STALLS//////////////////
-    ////////////////////////////////////////
-    getStalls: function () {
-      var self = this
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/stalls?all_wallets',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.stalls.push(mapStalls(response.data))
-        })
-    },
-    openStallUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.stalls, {id: linkId})
-
-      this.stallDialog.data = _.clone(link._data)
-      this.stallDialog.show = true
-    },
-    sendStallFormData: function () {
-      if (this.stallDialog.data.id) {
-      } else {
-        var data = {
-          name: this.stallDialog.data.name,
-          wallet: this.stallDialog.data.wallet,
-          publickey: this.stallDialog.data.publickey,
-          privatekey: this.stallDialog.data.privatekey,
-          relays: this.stallDialog.data.relays
-        }
-      }
-
-      if (this.stallDialog.data.id) {
-        this.updateStall(this.stallDialog.data)
-      } else {
-        this.createStall(data)
-      }
-    },
-    updateStall: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/stalls' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.stallDialog.data.wallet
-          }).inkey,
-          _.pick(data, 'name', 'wallet', 'publickey', 'privatekey')
-        )
-        .then(function (response) {
-          self.stalls = _.reject(self.stalls, function (obj) {
-            return obj.id == data.id
-          })
-          self.stalls.push(mapStalls(response.data))
-          self.stallDialog.show = false
-          self.stallDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createStall: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/stalls',
-          _.findWhere(self.g.user.wallets, {
-            id: self.stallDialog.data.wallet
-          }).inkey,
-          data
-        )
-        .then(function (response) {
-          self.stalls.push(mapStalls(response.data))
-          self.stallDialog.show = false
-          self.stallDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteStall: function (stallId) {
-      var self = this
-      var stall = _.findWhere(self.stalls, {id: stallId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Stall link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/stalls/' + stallId,
-              _.findWhere(self.g.user.wallets, {id: stall.wallet}).inkey
-            )
-            .then(function (response) {
-              self.stalls = _.reject(self.stalls, function (obj) {
-                return obj.id == stallId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportStallsCSV: function () {
-      LNbits.utils.exportCSV(this.stallsTable.columns, this.stalls)
-    },
-    ////////////////////////////////////////
-    ///////////////PRODUCTS/////////////////
-    ////////////////////////////////////////
-    getProducts: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/products?all_stalls',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.products.push(mapProducts(response.data))
-        })
-    },
-    openProductUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.products, {id: linkId})
-
-      self.productDialog.data = _.clone(link._data)
-      self.productDialog.show = true
-    },
-    sendProductFormData: function () {
-      if (this.productDialog.data.id) {
-      } else {
-        var data = {
-          product: this.productDialog.data.product,
-          categories:
-            this.productDialog.data.categories +
-            this.productDialog.categoriesextra,
-          description: this.productDialog.data.description,
-          image: this.productDialog.data.image,
-          price: this.productDialog.data.price,
-          quantity: this.productDialog.data.quantity
-        }
-      }
-      if (this.productDialog.data.id) {
-        this.updateProduct(this.productDialog.data)
-      } else {
-        this.createProduct(data)
-      }
-    },
-    imageAdded(file) {
-      let blobURL = URL.createObjectURL(file)
-      let image = new Image()
-      image.src = blobURL
-      image.onload = async () => {
-        let canvas = document.createElement('canvas')
-        canvas.setAttribute('width', 100)
-        canvas.setAttribute('height', 100)
-        await pica.resize(image, canvas, {
-          quality: 0,
-          alpha: true,
-          unsharpAmount: 95,
-          unsharpRadius: 0.9,
-          unsharpThreshold: 70
-        })
-        this.productDialog.data.image = canvas.toDataURL()
-        this.productDialog = {...this.productDialog}
-      }
-    },
-    imageCleared() {
-      this.productDialog.data.image = null
-      this.productDialog = {...this.productDialog}
-    },
-    updateProduct: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/products' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.productDialog.data.wallet
-          }).inkey,
-          _.pick(
-            data,
-            'shopname',
-            'relayaddress',
-            'shippingzone1',
-            'zone1cost',
-            'shippingzone2',
-            'zone2cost',
-            'email'
-          )
-        )
-        .then(function (response) {
-          self.products = _.reject(self.products, function (obj) {
-            return obj.id == data.id
-          })
-          self.products.push(mapProducts(response.data))
-          self.productDialog.show = false
-          self.productDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createProduct: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/products',
-          _.findWhere(self.g.user.wallets, {
-            id: self.productDialog.data.wallet
-          }).inkey,
-          data
-        )
-        .then(function (response) {
-          self.products.push(mapProducts(response.data))
-          self.productDialog.show = false
-          self.productDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteProduct: function (productId) {
-      var self = this
-      var product = _.findWhere(this.products, {id: productId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this products link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/products/' + productId,
-              _.findWhere(self.g.user.wallets, {id: product.wallet}).inkey
-            )
-            .then(function (response) {
-              self.products = _.reject(self.products, function (obj) {
-                return obj.id == productId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportProductsCSV: function () {
-      LNbits.utils.exportCSV(this.productsTable.columns, this.products)
-    },
-    ////////////////////////////////////////
-    //////////////////ZONE//////////////////
-    ////////////////////////////////////////
-    getZones: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/zones?all_wallets',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.zones.push(mapZone(response.data))
-        })
-    },
-    openZoneUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.zones, {id: linkId})
-
-      this.zoneDialog.data = _.clone(link._data)
-      this.zoneDialog.show = true
-    },
-    sendZoneFormData: function () {
-      if (this.zoneDialog.data.id) {
-      } else {
-        var data = {
-          countries: toString(this.zoneDialog.data.countries),
-          cost: parseInt(this.zoneDialog.data.cost)
-        }
-      }
-
-      if (this.zoneDialog.data.id) {
-        this.updateZone(this.zoneDialog.data)
-      } else {
-        this.createZone(data)
-      }
-    },
-    updateZone: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/zones' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.zoneDialog.data.wallet
-          }).inkey,
-          _.pick(data, 'countries', 'cost')
-        )
-        .then(function (response) {
-          self.zones = _.reject(self.zones, function (obj) {
-            return obj.id == data.id
-          })
-          self.zones.push(mapZone(response.data))
-          self.zoneDialog.show = false
-          self.zoneDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createZone: function (data) {
-      var self = this
-      console.log(self.g.user.wallets[0])
-      console.log(data)
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/zones',
-          self.g.user.wallets[0].inkey,
-          data
-        )
-        .then(function (response) {
-          self.zones.push(mapZone(response.data))
-          self.zoneDialog.show = false
-          self.zoneDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteZone: function (zoneId) {
-      var self = this
-      var zone = _.findWhere(self.zones, {id: zoneId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Zone link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/zones/' + zoneId,
-              _.findWhere(self.g.user.wallets, {id: zone.wallet}).inkey
-            )
-            .then(function (response) {
-              self.zones = _.reject(self.zones, function (obj) {
-                return obj.id == zoneId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportZonesCSV: function () {
-      LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
-    },
-    ////////////////////////////////////////
-    //////////////////SHOP//////////////////
-    ////////////////////////////////////////
-    getShops: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/shops?all_wallets',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.shops.push(mapShops(response.data))
-        })
-    },
-    openShopUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.shops, {id: linkId})
-
-      this.shopDialog.data = _.clone(link._data)
-      this.shopDialog.show = true
-    },
-    sendShopFormData: function () {
-      if (this.shopDialog.data.id) {
-      } else {
-        var data = {
-          countries: this.shopDialog.data.countries,
-          cost: this.shopDialog.data.cost
-        }
-      }
-
-      if (this.shopDialog.data.id) {
-        this.updateZone(this.shopDialog.data)
-      } else {
-        this.createZone(data)
-      }
-    },
-    updateShop: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/shops' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.shopDialog.data.wallet
-          }).inkey,
-          _.pick(data, 'countries', 'cost')
-        )
-        .then(function (response) {
-          self.shops = _.reject(self.shops, function (obj) {
-            return obj.id == data.id
-          })
-          self.shops.push(mapShops(response.data))
-          self.shopDialog.show = false
-          self.shopDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createShop: function (data) {
-      var self = this
-      console.log('cuntywoo')
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/shops',
-          _.findWhere(self.g.user.wallets, {
-            id: self.shopDialog.data.wallet
-          }).inkey,
-          data
-        )
-        .then(function (response) {
-          self.shops.push(mapShops(response.data))
-          self.shopDialog.show = false
-          self.shopDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteShop: function (shopId) {
-      var self = this
-      var shop = _.findWhere(self.shops, {id: shopId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Shop link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/shops/' + shopId,
-              _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
-            )
-            .then(function (response) {
-              self.shops = _.reject(self.shops, function (obj) {
-                return obj.id == shopId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportShopsCSV: function () {
-      LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
-    },
-    ////////////////////////////////////////
-    ////////////////ORDERS//////////////////
-    ////////////////////////////////////////
-    getOrders: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/orders?all_wallets',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.orders.push(mapOrders(response.data))
-        })
-    },
-    createOrder: function () {
-      var data = {
-        address: this.orderDialog.data.address,
-        email: this.orderDialog.data.email,
-        quantity: this.orderDialog.data.quantity,
-        shippingzone: this.orderDialog.data.shippingzone
-      }
-      var self = this
-
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/orders',
-          _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
-            .inkey,
-          data
-        )
-        .then(function (response) {
-          self.orders.push(mapOrders(response.data))
-          self.orderDialog.show = false
-          self.orderDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteOrder: function (orderId) {
-      var self = this
-      var order = _.findWhere(self.orders, {id: orderId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this order link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/orders/' + orderId,
-              _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
-            )
-            .then(function (response) {
-              self.orders = _.reject(self.orders, function (obj) {
-                return obj.id == orderId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    shipOrder: function (order_id) {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/orders/shipped/' + order_id,
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.orders.push(mapOrders(response.data))
-        })
-    },
-    exportOrdersCSV: function () {
-      LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
-    }
-  },
-  created: function () {
-    if (this.g.user.wallets.length) {
-      this.getStalls()
-      this.getProducts()
-      this.getZones()
-      this.getOrders()
-      this.customerKeys = [
-        'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
-        'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
-      ]
-    }
-  }
-})
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index d14d7cee..7b8f8e6a 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -300,8 +300,9 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated v-if="stalls.length === 0" color="primary" @click="productDialog.show = true"
-          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
+      
+        <q-btn unelevated v-if="stalls.length === 1" color="primary" @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a produc </q-tooltip></q-btn
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
@@ -309,7 +310,7 @@
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated v-if="zones.length === 0" color="primary" @click="stallDialog.show = true"
+        <q-btn unelevated v-if="zones.length === 1" color="primary" @click="stallDialog.show = true"
           >+ Stall
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
@@ -321,6 +322,7 @@
           >Launch frontend shop (not Nostr)
           <q-tooltip> Makes a simple frontend shop for your stalls</q-tooltip></q-btn
         >
+      
       </q-card-section>
     </q-card>
 
@@ -638,7 +640,890 @@
   </div>
   </div>
 </div>
+</div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
-<script src="/diagonalley/static/js/index.js"></script>
+
+<script>
+
+Vue.component(VueQrcode.name, VueQrcode)
+
+//const pica = window.pica()
+
+var mapStalls = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapProducts = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapZone = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+var mapOrders = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
+
+new Vue({
+  el: '#vue',
+  mixins: [windowMixin],
+  data: function () {
+    return {
+      products: [],
+      orders: [],
+      stalls: [],
+      zones: [],
+      customerKeys: [],
+      customerKey: '',
+      customerMessages: {},
+      shippedModel: false,
+      shippingZoneOptions: [
+        'Australia',
+        'Austria',
+        'Belgium',
+        'Brazil',
+        'Canada',
+        'Denmark',
+        'Finland',
+        'France',
+        'Germany',
+        'Greece',
+        'Hong Kong',
+        'Hungary',
+        'Ireland',
+        'Indonesia',
+        'Israel',
+        'Italy',
+        'Japan',
+        'Kazakhstan',
+        'Korea',
+        'Luxembourg',
+        'Malaysia',
+        'Mexico',
+        'Netherlands',
+        'New Zealand',
+        'Norway',
+        'Poland',
+        'Portugal',
+        'Russia',
+        'Saudi Arabia',
+        'Singapore',
+        'Spain',
+        'Sweden',
+        'Switzerland',
+        'Thailand',
+        'Turkey',
+        'Ukraine',
+        'United Kingdom**',
+        'United States***',
+        'Vietnam',
+        'China'
+      ],
+      categories: [
+        'Fashion (clothing and accessories)',
+        'Health (and beauty)',
+        'Toys (and baby equipment)',
+        'Media (Books and CDs)',
+        'Groceries (Food and Drink)',
+        'Technology (Phones and Computers)',
+        'Home (furniture and accessories)',
+        'Gifts (flowers, cards, etc)',
+        'Adult'
+      ],
+      relayOptions: [
+        'wss://nostr-relay.herokuapp.com/ws',
+        'wss://nostr-relay.bigsun.xyz/ws',
+        'wss://freedom-relay.herokuapp.com/ws'
+      ],
+      label: '',
+      ordersTable: {
+        columns: [
+          {
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },
+          {
+            name: 'address',
+            align: 'left',
+            label: 'Address',
+            field: 'address'
+          },
+          {
+            name: 'invoiceid',
+            align: 'left',
+            label: 'InvoiceID',
+            field: 'invoiceid'
+          },
+          {name: 'paid', align: 'left', label: 'Paid', field: 'paid'},
+          {name: 'shipped', align: 'left', label: 'Shipped', field: 'shipped'}
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      productsTable: {
+        columns: [
+          {
+            name: 'stall',
+            align: 'left',
+            label: 'Stall',
+            field: 'stall'
+          },
+          {
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'description',
+            align: 'left',
+            label: 'Description',
+            field: 'description'
+          },
+          {
+            name: 'categories',
+            align: 'left',
+            label: 'Categories',
+            field: 'categories'
+          },
+          {name: 'price', align: 'left', label: 'Price', field: 'price'},
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },
+          {name: 'id', align: 'left', label: 'ID', field: 'id'}
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      stallTable: {
+        columns: [
+          {
+            name: 'id',
+            align: 'left',
+            label: 'ID',
+            field: 'id'
+          },
+          {
+            name: 'name',
+            align: 'left',
+            label: 'Name',
+            field: 'name'
+          },
+          {
+            name: 'wallet',
+            align: 'left',
+            label: 'Wallet',
+            field: 'wallet'
+          },
+          {
+            name: 'publickey',
+            align: 'left',
+            label: 'Public key',
+            field: 'publickey'
+          },
+          {
+            name: 'privatekey',
+            align: 'left',
+            label: 'Private key',
+            field: 'privatekey'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      zonesTable: {
+        columns: [
+          {
+            name: 'id',
+            align: 'left',
+            label: 'ID',
+            field: 'id'
+          },
+          {
+            name: 'countries',
+            align: 'left',
+            label: 'Countries',
+            field: 'countries'
+          },
+          {
+            name: 'cost',
+            align: 'left',
+            label: 'Cost',
+            field: 'cost'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      productDialog: {
+        show: false,
+        data: {}
+      },
+      stallDialog: {
+        show: false,
+        data: {}
+      },
+      zoneDialog: {
+        show: false,
+        data: {countries:[]}
+      },
+      shopDialog: {
+        show: false,
+        data: {activate: false}
+      },
+      orderDialog: {
+        show: false,
+        data: {}
+      },
+      relayDialog: {
+        show: false,
+        data: {}
+      }
+    }
+  },
+  computed: {
+    categoryOther: function () {
+      cats = trim(this.productDialog.data.categories.split(','))
+      for (let i = 0; i < cats.length; i++) {
+        if (cats[i] == 'Others') {
+          return true
+        }
+      }
+      return false
+    }
+  },
+  methods: {
+    capitalizeFirstLetter: function (string) {
+      return string.charAt(0).toUpperCase() + string.slice(1);
+    },
+    errorMessage: function (error) {
+      this.$q.notify({
+        color: 'primary',
+        message: error
+      })
+    },
+    ////////////////////////////////////////
+    ///////////SUPPORT MESSAGES/////////////
+    ////////////////////////////////////////
+    getMessages: function (customerKey) {
+      var self = this
+      messages = []
+      messages.push(['in', 'blah blah'])
+      messages.push(['out', 'blah blah'])
+      self.customerMessages = messages
+    },
+    ////////////////////////////////////////
+    ////////////////STALLS//////////////////
+    ////////////////////////////////////////
+    getStalls: function () {
+      var self = this
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/stalls?all_wallets',
+          self.g.user.wallets[0].adminkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.stalls = response.data.map(mapStalls)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    openStallUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.stalls, {id: linkId})
+
+      this.stallDialog.data = _.clone(link._data)
+      this.stallDialog.show = true
+    },
+    sendStallFormData: function () {
+      if (this.stallDialog.data.id) {
+      } else {
+        var data = {
+          name: this.stallDialog.data.name,
+          wallet: this.stallDialog.data.wallet,
+          publickey: this.stallDialog.data.publickey,
+          privatekey: this.stallDialog.data.privatekey,
+          relays: this.stallDialog.data.relays
+        }
+      }
+
+      if (this.stallDialog.data.id) {
+        this.updateStall(this.stallDialog.data)
+      } else {
+        this.createStall(data)
+      }
+    },
+    updateStall: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/stalls' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.stallDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'name', 'wallet', 'publickey', 'privatekey')
+        )
+        .then(function (response) {
+          self.stalls = _.reject(self.stalls, function (obj) {
+            return obj.id == data.id
+          })
+          self.stalls.push(mapStalls(response.data))
+          self.stallDialog.show = false
+          self.stallDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createStall: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/stalls',
+          _.findWhere(self.g.user.wallets, {
+            id: self.stallDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.stalls.push(mapStalls(response.data))
+          self.stallDialog.show = false
+          self.stallDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteStall: function (stallId) {
+      var self = this
+      var stall = _.findWhere(self.stalls, {id: stallId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Stall link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/stalls/' + stallId,
+              _.findWhere(self.g.user.wallets, {id: stall.wallet}).inkey
+            )
+            .then(function (response) {
+              self.stalls = _.reject(self.stalls, function (obj) {
+                return obj.id == stallId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportStallsCSV: function () {
+      LNbits.utils.exportCSV(this.stallsTable.columns, this.stalls)
+    },
+    ////////////////////////////////////////
+    ///////////////PRODUCTS/////////////////
+    ////////////////////////////////////////
+    getProducts: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/products?all_stalls',
+          self.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.products = response.data.map(mapProducts)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    openProductUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.products, {id: linkId})
+
+      self.productDialog.data = _.clone(link._data)
+      self.productDialog.show = true
+    },
+    sendProductFormData: function () {
+      if (this.productDialog.data.id) {
+      } else {
+        var data = {
+          product: this.productDialog.data.product,
+          categories:
+            this.productDialog.data.categories +
+            this.productDialog.categoriesextra,
+          description: this.productDialog.data.description,
+          image: this.productDialog.data.image,
+          price: this.productDialog.data.price,
+          quantity: this.productDialog.data.quantity
+        }
+      }
+      if (this.productDialog.data.id) {
+        this.updateProduct(this.productDialog.data)
+      } else {
+        this.createProduct(data)
+      }
+    },
+    imageAdded(file) {
+      let blobURL = URL.createObjectURL(file)
+      let image = new Image()
+      image.src = blobURL
+      image.onload = async () => {
+        let canvas = document.createElement('canvas')
+        canvas.setAttribute('width', 100)
+        canvas.setAttribute('height', 100)
+        await pica.resize(image, canvas, {
+          quality: 0,
+          alpha: true,
+          unsharpAmount: 95,
+          unsharpRadius: 0.9,
+          unsharpThreshold: 70
+        })
+        this.productDialog.data.image = canvas.toDataURL()
+        this.productDialog = {...this.productDialog}
+      }
+    },
+    imageCleared() {
+      this.productDialog.data.image = null
+      this.productDialog = {...this.productDialog}
+    },
+    updateProduct: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/products' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.productDialog.data.wallet
+          }).inkey,
+          _.pick(
+            data,
+            'shopname',
+            'relayaddress',
+            'shippingzone1',
+            'zone1cost',
+            'shippingzone2',
+            'zone2cost',
+            'email'
+          )
+        )
+        .then(function (response) {
+          self.products = _.reject(self.products, function (obj) {
+            return obj.id == data.id
+          })
+          self.products.push(mapProducts(response.data))
+          self.productDialog.show = false
+          self.productDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createProduct: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/products',
+          _.findWhere(self.g.user.wallets, {
+            id: self.productDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.products.push(mapProducts(response.data))
+          self.productDialog.show = false
+          self.productDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteProduct: function (productId) {
+      var self = this
+      var product = _.findWhere(this.products, {id: productId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this products link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/products/' + productId,
+              _.findWhere(self.g.user.wallets, {id: product.wallet}).inkey
+            )
+            .then(function (response) {
+              self.products = _.reject(self.products, function (obj) {
+                return obj.id == productId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportProductsCSV: function () {
+      LNbits.utils.exportCSV(this.productsTable.columns, this.products)
+    },
+    ////////////////////////////////////////
+    //////////////////ZONE//////////////////
+    ////////////////////////////////////////
+    getZones: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/zones',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            console.log(response)
+            self.zones = response.data.map(mapZone)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    openZoneUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.zones, {id: linkId})
+      countriesArray = link._data.countries.split(",")
+      for (let i = 0; i < countriesArray.length; i++) {
+        countriesArray[i] = self.capitalizeFirstLetter(countriesArray[i])
+      }
+      link._data.countries = countriesArray
+      this.zoneDialog.data = _.clone(link._data)
+      this.zoneDialog.show = true
+    },
+    sendZoneFormData: function () {
+    var data = {
+          countries: String(this.zoneDialog.data.countries),
+          cost: parseInt(this.zoneDialog.data.cost)
+    }
+      if (this.zoneDialog.data.id) {
+        data.id = this.zoneDialog.data.id
+        this.updateZone(data)
+      } else {
+        this.createZone(data)
+      }
+    },
+    updateZone: function (data) {
+      console.log(data)
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/zones/' + data.id,
+          self.g.user.wallets[0].adminkey,
+          data
+        )
+        .then(function (response) {
+          console.log(response)
+          self.zones = _.reject(self.zones, function (obj) {
+            return obj.id == data.id
+          })
+          self.zones.push(mapZone(response.data))
+          self.zoneDialog.show = false
+          self.zoneDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createZone: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/zones',
+          self.g.user.wallets[0].inkey,
+          data
+        )
+        .then(function (response) {
+          self.zones.push(mapZone(response.data))
+          self.zoneDialog.show = false
+          self.zoneDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteZone: function (zoneId) {
+      var self = this
+      var zone = _.findWhere(self.zones, {id: zoneId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Zone link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/zones/' + zoneId,
+              self.g.user.wallets[0].adminkey
+            )
+            .then(function (response) {
+              self.zones = _.reject(self.zones, function (obj) {
+                return obj.id == zoneId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportZonesCSV: function () {
+      LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
+    },
+    ////////////////////////////////////////
+    //////////////////SHOP//////////////////
+    ////////////////////////////////////////
+    getShops: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/shops?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.shops = response.data.map(mapShops)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    openShopUpdateDialog: function (linkId) {
+      var self = this
+      var link = _.findWhere(self.shops, {id: linkId})
+
+      this.shopDialog.data = _.clone(link._data)
+      this.shopDialog.show = true
+    },
+    sendShopFormData: function () {
+      if (this.shopDialog.data.id) {
+      } else {
+        var data = {
+          countries: this.shopDialog.data.countries,
+          cost: this.shopDialog.data.cost
+        }
+      }
+
+      if (this.shopDialog.data.id) {
+        this.updateZone(this.shopDialog.data)
+      } else {
+        this.createZone(data)
+      }
+    },
+    updateShop: function (data) {
+      var self = this
+      LNbits.api
+        .request(
+          'PUT',
+          '/diagonalley/api/v1/shops' + data.id,
+          _.findWhere(self.g.user.wallets, {
+            id: self.shopDialog.data.wallet
+          }).inkey,
+          _.pick(data, 'countries', 'cost')
+        )
+        .then(function (response) {
+          self.shops = _.reject(self.shops, function (obj) {
+            return obj.id == data.id
+          })
+          self.shops.push(mapShops(response.data))
+          self.shopDialog.show = false
+          self.shopDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createShop: function (data) {
+      var self = this
+      console.log('cuntywoo')
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/shops',
+          _.findWhere(self.g.user.wallets, {
+            id: self.shopDialog.data.wallet
+          }).inkey,
+          data
+        )
+        .then(function (response) {
+          self.shops.push(mapShops(response.data))
+          self.shopDialog.show = false
+          self.shopDialog.data = {}
+          data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteShop: function (shopId) {
+      var self = this
+      var shop = _.findWhere(self.shops, {id: shopId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this Shop link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/shops/' + shopId,
+              _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
+            )
+            .then(function (response) {
+              self.shops = _.reject(self.shops, function (obj) {
+                return obj.id == shopId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportShopsCSV: function () {
+      LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
+    },
+    ////////////////////////////////////////
+    ////////////////ORDERS//////////////////
+    ////////////////////////////////////////
+    getOrders: function () {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/orders?all_wallets',
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.orders = response.data.map(mapOrders)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    createOrder: function () {
+      var data = {
+        address: this.orderDialog.data.address,
+        email: this.orderDialog.data.email,
+        quantity: this.orderDialog.data.quantity,
+        shippingzone: this.orderDialog.data.shippingzone
+      }
+      var self = this
+
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/orders',
+          _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
+            .inkey,
+          data
+        )
+        .then(function (response) {
+          self.orders.push(mapOrders(response.data))
+          self.orderDialog.show = false
+          self.orderDialog.data = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteOrder: function (orderId) {
+      var self = this
+      var order = _.findWhere(self.orders, {id: orderId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this order link?')
+        .onOk(function () {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/diagonalley/api/v1/orders/' + orderId,
+              _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
+            )
+            .then(function (response) {
+              self.orders = _.reject(self.orders, function (obj) {
+                return obj.id == orderId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    shipOrder: function (order_id) {
+      var self = this
+
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/orders/shipped/' + order_id,
+          this.g.user.wallets[0].inkey
+        )
+        .then(function (response) {
+          self.orders.push(mapOrders(response.data))
+        })
+    },
+    exportOrdersCSV: function () {
+      LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
+    }
+  },
+  created: function () {
+    if (this.g.user.wallets.length) {
+      this.getStalls()
+      this.getProducts()
+      this.getZones()
+      this.getOrders()
+      this.customerKeys = [
+        'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
+        'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
+      ]
+      console.log(this.products.length)
+    }
+  }
+})
+</script>
 {% endblock %}
+
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 43232841..6363dc97 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -121,36 +121,32 @@ async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = D
 
 
 @diagonalley_ext.get("/api/v1/zones")
-async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
-    wallet_ids = [wallet.wallet.id]
+async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
 
-    if all_wallets:
-        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
-
-    return ([zone.dict() for zone in await get_diagonalley_zones(wallet_ids)])
+    return await get_diagonalley_zones(wallet.wallet.user)
 
 @diagonalley_ext.post("/api/v1/zones")
-@diagonalley_ext.put("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_create(
     data: createZones, 
-    zone_id: str = Query(None),  
     wallet: WalletTypeInfo = Depends(get_key_type)
     ):
-    if zone_id:
-        zone = await get_diagonalley_zone(zone_id)
-
-        if not zone:
-            return ({"message": "Zone does not exist."})
-
-        if zone.wallet != wallet.wallet.id:
-            return ({"message": "Not your record."})
-
-        zone = await update_diagonalley_zone(zone_id, **data.dict())
-    else:
-        zone = await create_diagonalley_zone(wallet=wallet.wallet.id, data=data)
-
+    zone = await create_diagonalley_zone(user=wallet.wallet.user, data=data)
     return zone.dict()
 
+@diagonalley_ext.post("/api/v1/zones/{zone_id}")
+async def api_diagonalley_zone_update(
+    data: createZones, 
+    zone_id: str = Query(None),  
+    wallet: WalletTypeInfo = Depends(require_admin_key)
+    ):
+    zone = await get_diagonalley_zone(zone_id)
+    if not zone:
+        return ({"message": "Zone does not exist."})
+    if zone.user != wallet.wallet.user:
+        return ({"message": "Not your record."})
+    zone = await update_diagonalley_zone(zone_id, **data.dict())
+    return zone
+
 
 @diagonalley_ext.delete("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
@@ -159,7 +155,7 @@ async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(
     if not zone:
         return ({"message": "zone does not exist."})
 
-    if zone.wallet != wallet.wallet.id:
+    if zone.user != wallet.wallet.user:
         return ({"message": "Not your zone."})
 
     await delete_diagonalley_zone(zone_id)

From 671ac08a046052615fa0366578d9e3365f9de5f1 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Sun, 6 Feb 2022 22:40:51 +0000
Subject: [PATCH 040/174] small fix

---
 .../templates/diagonalley/index.html          | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 7b8f8e6a..6d6ea872 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -244,7 +244,7 @@
           label="Private Key"
         ></q-input>
         <q-select
-          :options="shippingZoneOptions"
+          :options="zoneOptions"
           filled
           dense
           multiple
@@ -262,7 +262,7 @@
         <q-input
           filled
           dense
-          v-model.trim="stallDialog.data.name"
+          v-model.trim="stallDialog.data.crelays"
           label="Custom relays (seperate by comma)"
         ></q-input>
         
@@ -270,7 +270,7 @@
           filled
           dense
           v-model.trim="stallDialog.data.nostrShops"
-          label="Stall public keys (seperate by comma)"
+          label="Nostr shop public keys (seperate by comma)"
         ></q-input>
         <div class="row q-mt-lg">
           <q-btn
@@ -301,8 +301,8 @@
     <q-card>
       <q-card-section>
       
-        <q-btn unelevated v-if="stalls.length === 1" color="primary" @click="productDialog.show = true"
-          >+ Product <q-tooltip> List a produc </q-tooltip></q-btn
+        <q-btn unelevated v-if="stalls.length > 1" color="primary" @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
@@ -310,7 +310,7 @@
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated v-if="zones.length === 1" color="primary" @click="stallDialog.show = true"
+        <q-btn unelevated v-if="zones.length > 1" color="primary" @click="openStallDialog()"
           >+ Stall
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
@@ -675,6 +675,7 @@ new Vue({
       orders: [],
       stalls: [],
       zones: [],
+      zoneOptions: [],
       customerKeys: [],
       customerKey: '',
       customerMessages: {},
@@ -949,10 +950,19 @@ new Vue({
             LNbits.utils.notifyApiError(error)
           })
     },
+    openStallDialog: function () {
+      console.log(this.zones[0]['id'])
+      for(let i = 0; i < this.zones.length; i ++){
+        this.zoneOptions.push(this.zones[i]['id'])
+      }
+      this.stallDialog.show = true
+    },
     openStallUpdateDialog: function (linkId) {
       var self = this
       var link = _.findWhere(self.stalls, {id: linkId})
-
+      for(let i = 0; i < this.zones.length; i ++){
+        this.zoneOptions.push(this.stalls[i][0])
+      }
       this.stallDialog.data = _.clone(link._data)
       this.stallDialog.show = true
     },
@@ -1210,6 +1220,7 @@ new Vue({
           if (response.data) {
             console.log(response)
             self.zones = response.data.map(mapZone)
+            
           }
         })
         .catch(function (error) {

From 61cf79de691221ed631c58f77c25c76f522e9c85 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Mon, 7 Feb 2022 13:22:43 +0000
Subject: [PATCH 041/174] Added nostr ext

---
 lnbits/extensions/nostr/README.md             |   3 +
 lnbits/extensions/nostr/__init__.py           |  17 +
 lnbits/extensions/nostr/config.json           |   6 +
 lnbits/extensions/nostr/crud.py               | 134 +++++
 lnbits/extensions/nostr/migrations.py         |  47 ++
 lnbits/extensions/nostr/models.py             |  34 ++
 .../templates/lnurldevice/_api_docs.html      | 169 ++++++
 .../nostr/templates/lnurldevice/error.html    |  34 ++
 .../nostr/templates/lnurldevice/index.html    | 534 ++++++++++++++++++
 .../nostr/templates/lnurldevice/paid.html     |  27 +
 lnbits/extensions/nostr/views.py              |  24 +
 lnbits/extensions/nostr/views_api.py          |  48 ++
 12 files changed, 1077 insertions(+)
 create mode 100644 lnbits/extensions/nostr/README.md
 create mode 100644 lnbits/extensions/nostr/__init__.py
 create mode 100644 lnbits/extensions/nostr/config.json
 create mode 100644 lnbits/extensions/nostr/crud.py
 create mode 100644 lnbits/extensions/nostr/migrations.py
 create mode 100644 lnbits/extensions/nostr/models.py
 create mode 100644 lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
 create mode 100644 lnbits/extensions/nostr/templates/lnurldevice/error.html
 create mode 100644 lnbits/extensions/nostr/templates/lnurldevice/index.html
 create mode 100644 lnbits/extensions/nostr/templates/lnurldevice/paid.html
 create mode 100644 lnbits/extensions/nostr/views.py
 create mode 100644 lnbits/extensions/nostr/views_api.py

diff --git a/lnbits/extensions/nostr/README.md b/lnbits/extensions/nostr/README.md
new file mode 100644
index 00000000..596cce9d
--- /dev/null
+++ b/lnbits/extensions/nostr/README.md
@@ -0,0 +1,3 @@
+# Nostr
+
+Opens a Nostr daemon
diff --git a/lnbits/extensions/nostr/__init__.py b/lnbits/extensions/nostr/__init__.py
new file mode 100644
index 00000000..775960e3
--- /dev/null
+++ b/lnbits/extensions/nostr/__init__.py
@@ -0,0 +1,17 @@
+from fastapi import APIRouter
+
+from lnbits.db import Database
+from lnbits.helpers import template_renderer
+
+db = Database("ext_nostr")
+
+nostr_ext: APIRouter = APIRouter(prefix="/nostr", tags=["nostr"])
+
+
+def nostr_renderer():
+    return template_renderer(["lnbits/extensions/nostr/templates"])
+
+
+from .lnurl import *  # noqa
+from .views import *  # noqa
+from .views_api import *  # noqa
diff --git a/lnbits/extensions/nostr/config.json b/lnbits/extensions/nostr/config.json
new file mode 100644
index 00000000..a32e39a1
--- /dev/null
+++ b/lnbits/extensions/nostr/config.json
@@ -0,0 +1,6 @@
+{
+  "name": "Nostr",
+  "short_description": "Daemon for Nostr",
+  "icon": "swap_horizontal_circle",
+  "contributors": ["arcbtc"]
+}
diff --git a/lnbits/extensions/nostr/crud.py b/lnbits/extensions/nostr/crud.py
new file mode 100644
index 00000000..55e99ec6
--- /dev/null
+++ b/lnbits/extensions/nostr/crud.py
@@ -0,0 +1,134 @@
+from typing import List, Optional, Union
+
+from lnbits.helpers import urlsafe_short_hash
+
+from . import db
+from .models import nostrKeys, nostrNotes, nostrRelays, nostrConnections
+
+###############KEYS##################
+
+async def create_nostrkeys(
+    data: nostrKeys
+) -> nostrKeys:
+    nostrkey_id = urlsafe_short_hash()
+    await db.execute(
+        """
+        INSERT INTO nostr.keys (
+            id,
+            pubkey,
+            privkey
+        )
+        VALUES (?, ?, ?)
+        """,
+        (nostrkey_id, data.pubkey, data.privkey),
+    )
+    return await get_nostrkeys(nostrkey_id)
+
+async def get_nostrkeys(nostrkey_id: str) -> nostrKeys:
+    row = await db.fetchone(
+        "SELECT * FROM nostr.keys WHERE id = ?",
+        (lnurldevicepayment_id,),
+    )
+    return nostrKeys(**row) if row else None
+
+
+###############NOTES##################
+
+async def create_nostrnotes(
+    data: nostrNotes
+) -> nostrNotes:
+    await db.execute(
+        """
+        INSERT INTO nostr.notes (
+            id,
+            pubkey,
+            created_at,
+            kind,
+            tags,
+            content,
+            sig
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+        """,
+        (data.id, data.pubkey, data.created_at, data.kind, data.tags, data.content, data.sig),
+    )
+    return await get_nostrnotes(data.id)
+
+async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
+    row = await db.fetchone(
+        "SELECT * FROM nostr.notes WHERE id = ?",
+        (nostrnote_id,),
+    )
+    return nostrNotes(**row) if row else None
+
+###############RELAYS##################
+
+async def create_nostrrelays(
+    relay: str
+) -> nostrRelays:
+    nostrrelay_id = urlsafe_short_hash()
+    await db.execute(
+        """
+        INSERT INTO nostr.relays (
+            id,
+            relay
+        )
+        VALUES (?, ?)
+        """,
+        (nostrrelay_id, relay),
+    )
+    return await get_nostrnotes(nostrrelay_id)
+
+async def get_nostrrelays(nostrrelay_id: str) -> nostrRelays:
+    row = await db.fetchone(
+        "SELECT * FROM nostr.relays WHERE id = ?",
+        (nostrnote_id,),
+    )
+    return nostrRelays(**row) if row else None
+
+
+###############CONNECTIONS##################
+
+async def create_nostrconnections(
+    data: nostrNotes
+) -> nostrNotes:
+    nostrkey_id = urlsafe_short_hash()
+    await db.execute(
+        """
+        INSERT INTO nostr.notes (
+            id,
+            pubkey,
+            created_at,
+            kind,
+            tags,
+            content,
+            sig
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+        """,
+        (data.id, data.pubkey, data.created_at, data.kind, data.tags, data.content, data.sig),
+    )
+    return await get_nostrnotes(data.id)
+
+async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
+    row = await db.fetchone(
+        "SELECT * FROM nostr.notes WHERE id = ?",
+        (nostrnote_id,),
+    )
+    return nostrNotes(**row) if row else None
+
+
+
+async def update_lnurldevicepayment(
+    lnurldevicepayment_id: str, **kwargs
+) -> Optional[lnurldevicepayment]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+    await db.execute(
+        f"UPDATE lnurldevice.lnurldevicepayment SET {q} WHERE id = ?",
+        (*kwargs.values(), lnurldevicepayment_id),
+    )
+    row = await db.fetchone(
+        "SELECT * FROM lnurldevice.lnurldevicepayment WHERE id = ?",
+        (lnurldevicepayment_id,),
+    )
+    return lnurldevicepayment(**row) if row else None
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/migrations.py b/lnbits/extensions/nostr/migrations.py
new file mode 100644
index 00000000..de32a578
--- /dev/null
+++ b/lnbits/extensions/nostr/migrations.py
@@ -0,0 +1,47 @@
+from lnbits.db import Database
+
+db2 = Database("ext_nostr")
+
+
+async def m001_initial(db):
+    """
+    Initial nostr table.
+    """
+    await db.execute(
+        f"""
+        CREATE TABLE nostr.keys (
+            pubkey TEXT NOT NULL PRIMARY KEY,
+            privkey TEXT NOT NULL
+        );
+    """
+    )
+    await db.execute(
+        f"""
+        CREATE TABLE nostr.notes (
+            id TEXT NOT NULL PRIMARY KEY,
+            pubkey TEXT NOT NULL,
+            created_at TEXT NOT NULL,
+            kind INT NOT NULL,
+            tags TEXT NOT NULL,
+            content TEXT NOT NULL,
+            sig TEXT NOT NULL,
+        );
+    """
+    )
+    await db.execute(
+        f"""
+        CREATE TABLE nostr.relays (
+            id TEXT NOT NULL PRIMARY KEY,
+            relay TEXT NOT NULL
+        );
+    """
+    )
+    await db.execute(
+        f"""
+        CREATE TABLE nostr.connections (
+            id TEXT NOT NULL PRIMARY KEY,
+            publickey TEXT NOT NULL,
+            relayid TEXT NOT NULL
+        );
+    """
+    )
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/models.py b/lnbits/extensions/nostr/models.py
new file mode 100644
index 00000000..ba0c87a5
--- /dev/null
+++ b/lnbits/extensions/nostr/models.py
@@ -0,0 +1,34 @@
+import json
+from sqlite3 import Row
+from typing import Optional
+
+from fastapi import Request
+from lnurl import Lnurl
+from lnurl import encode as lnurl_encode  # type: ignore
+from lnurl.models import LnurlPaySuccessAction, UrlAction  # type: ignore
+from lnurl.types import LnurlPayMetadata  # type: ignore
+from pydantic import BaseModel
+from pydantic.main import BaseModel
+
+class nostrKeys(BaseModel):
+    id: str
+    pubkey: str
+    privkey: str
+
+class nostrNotes(BaseModel):
+    id: str
+    pubkey: str
+    created_at: str
+    kind: int
+    tags: str
+    content: str
+    sig: str
+
+class nostrRelays(BaseModel):
+    id: str
+    relay: str
+
+class nostrConnections(BaseModel):
+    id: str
+    pubkey: str
+    relayid: str
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html b/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
new file mode 100644
index 00000000..af69b76e
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
@@ -0,0 +1,169 @@
+<q-card>
+  <q-card-section>
+    <p>
+      Register LNURLDevice devices to receive payments in your LNbits wallet.<br />
+      Build your own here
+      <a href="https://github.com/arcbtc/bitcoinpos"
+        >https://github.com/arcbtc/bitcoinpos</a
+      ><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 lnurldevice"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue"></span> /lnurldevice/api/v1/lnurlpos</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;lnurldevice_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X POST {{ request.base_url }}api/v1/lnurldevice -d '{"title":
+            &lt;string&gt;, "message":&lt;string&gt;, "currency":
+            &lt;integer&gt;}' -H "Content-type: application/json" -H "X-Api-Key:
+            {{user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-expansion-item
+      group="api"
+      dense
+      expand-separator
+      label="Update lnurldevice"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">PUT</span>
+            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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;lnurldevice_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X POST {{ request.base_url
+            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -d ''{"title":
+            &lt;string&gt;, "message":&lt;string&gt;, "currency":
+            &lt;integer&gt;} -H "Content-type: application/json" -H "X-Api-Key:
+            {{user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+
+    <q-expansion-item
+      group="api"
+      dense
+      expand-separator
+      label="Get lnurldevice"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span>
+            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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;lnurldevice_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.base_url
+            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -H "X-Api-Key: {{
+            user.wallets[0].inkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-expansion-item
+      group="api"
+      dense
+      expand-separator
+      label="Get lnurldevices"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span>
+            /lnurldevice/api/v1/lnurlposs</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;lnurldevice_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.base_url }}api/v1/lnurldevices -H
+            "X-Api-Key: {{ 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>
+            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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.base_url
+            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -H "X-Api-Key: {{
+            user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+  </q-expansion-item>
+</q-card>
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/error.html b/lnbits/extensions/nostr/templates/lnurldevice/error.html
new file mode 100644
index 00000000..d8e41832
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/lnurldevice/error.html
@@ -0,0 +1,34 @@
+{% extends "public.html" %} {% block page %}
+<div class="row q-col-gutter-md justify-center">
+  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
+    <q-card class="q-pa-lg">
+      <q-card-section class="q-pa-none">
+        <center>
+          <h3 class="q-my-none">LNURL-pay not paid</h3>
+          <br />
+          <q-icon
+            name="warning"
+            class="text-grey"
+            style="font-size: 20rem"
+          ></q-icon>
+
+          <br />
+        </center>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  {% endblock %} {% block scripts %}
+
+  <script>
+    new Vue({
+      el: '#vue',
+      mixins: [windowMixin],
+      data: function () {
+        return {}
+      }
+    })
+  </script>
+
+  {% endblock %}
+</div>
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/index.html b/lnbits/extensions/nostr/templates/lnurldevice/index.html
new file mode 100644
index 00000000..b51e2556
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/lnurldevice/index.html
@@ -0,0 +1,534 @@
+{% 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="formDialoglnurldevice.show = true"
+          >New LNURLDevice 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">lNURLdevice</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="exportlnurldeviceCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          flat
+          dense
+          :data="lnurldeviceLinks"
+          row-key="id"
+          :columns="lnurldevicesTable.columns"
+          :pagination.sync="lnurldevicesTable.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
+                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>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deletelnurldeviceLink(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                >
+                  <q-tooltip> Delete LNURLDevice </q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openlnurldeviceSettings(props.row.id)"
+                  icon="perm_data_setting"
+                  color="primary"
+                >
+                  <q-tooltip> LNURLDevice Settings </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">
+          {{SITE_TITLE}} LNURLDevice Extension
+        </h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none">
+        <q-separator></q-separator>
+        <q-list> {% include "lnurldevice/_api_docs.html" %} </q-list>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  <q-dialog
+    v-model="settingsDialog.show"
+    deviceition="top"
+    @hide="closeFormDialog"
+  >
+    <q-card
+      style="width: 700px; max-width: 80vw"
+      class="q-pa-lg q-pt-xl lnbits__dialog-card"
+    >
+      <div class="text-h6">LNURLDevice device string</div>
+      <q-btn
+        dense
+        outline
+        unelevated
+        color="primary"
+        size="md"
+        @click="copyText(location + '/lnurldevice/api/v1/lnurl/' + settingsDialog.data.id + ',' +
+      settingsDialog.data.key + ',' + settingsDialog.data.currency, 'Link copied to clipboard!')"
+        >{% raw
+        %}{{location}}/lnurldevice/api/v1/lnurl/{{settingsDialog.data.id}},
+        {{settingsDialog.data.key}}, {{settingsDialog.data.currency}}{% endraw
+        %}<q-tooltip> Click to copy URL </q-tooltip>
+      </q-btn>
+
+      <div class="text-subtitle2">
+        <small> </small>
+      </div>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog
+    v-model="formDialoglnurldevice.show"
+    deviceition="top"
+    @hide="closeFormDialog"
+  >
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-form @submit="sendFormDatalnurldevice" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="formDialoglnurldevice.data.title"
+          type="text"
+          label="Title"
+        ></q-input>
+
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="formDialoglnurldevice.data.wallet"
+          :options="g.user.walletOptions"
+          label="Wallet *"
+        ></q-select>
+
+        <q-select
+          filled
+          dense
+          v-model.trim="formDialoglnurldevice.data.currency"
+          type="text"
+          label="Fiat currency for device"
+          :options="currency"
+        ></q-select>
+        <q-option-group
+          v-model.trim="formDialoglnurldevice.data.device"
+          :options="devices"
+          color="primary"
+          label="Type of device"
+        ></q-option-group>
+        <q-input
+          filled
+          dense
+          v-model.trim="formDialoglnurldevice.data.profit"
+          type="number"
+          max="90"
+          label="Profit margin (% added to invoices/deducted from faucets)"
+        ></q-input>
+
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="formDialoglnurldevice.data.id"
+            unelevated
+            color="primary"
+            :disable="
+                formDialoglnurldevice.data.title == ''"
+            type="submit"
+            >Update lnurldevice</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="
+                formDialoglnurldevice.data.title == ''"
+            type="submit"
+            >Create lnurldevice</q-btn
+          >
+          <q-btn @click="cancellnurldevice" 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>
+  Vue.component(VueQrcode.name, VueQrcode)
+
+  var maplnurldevice = 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'
+      )
+    }
+    return obj
+  }
+
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        location: window.location.hostname,
+        filter: '',
+        currency: 'USD',
+        lnurldeviceLinks: [],
+        lnurldeviceLinksObj: [],
+        devices: [
+          {
+            label: 'PoS',
+            value: 'pos'
+          },
+          {
+            label: 'ATM',
+            value: 'atm'
+          }
+        ],
+        lnurldevicesTable: {
+          columns: [
+            {
+              name: 'title',
+              align: 'left',
+              label: 'title',
+              field: 'title'
+            },
+            {
+              name: 'theId',
+              align: 'left',
+              label: 'id',
+              field: 'id'
+            },
+            {
+              name: 'key',
+              align: 'left',
+              label: 'key',
+              field: 'key'
+            },
+            {
+              name: 'wallet',
+              align: 'left',
+              label: 'wallet',
+              field: 'wallet'
+            },
+            {
+              name: 'device',
+              align: 'left',
+              label: 'device',
+              field: 'device'
+            },
+            {
+              name: 'profit',
+              align: 'left',
+              label: 'profit',
+              field: 'profit'
+            },
+            {
+              name: 'currency',
+              align: 'left',
+              label: 'currency',
+              field: 'currency'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        },
+        passedlnurldevice: {},
+        settingsDialog: {
+          show: false,
+          data: {}
+        },
+        formDialog: {
+          show: false,
+          data: {}
+        },
+        formDialoglnurldevice: {
+          show: false,
+          data: {
+            lnurl_toggle: false,
+            show_message: false,
+            show_ack: false,
+            show_price: 'None',
+            device: 'pos',
+            profit: 2,
+            title: ''
+          }
+        },
+        qrCodeDialog: {
+          show: false,
+          data: null
+        }
+      }
+    },
+    methods: {
+      cancellnurldevice: function (data) {
+        var self = this
+        self.formDialoglnurldevice.show = false
+        self.clearFormDialoglnurldevice()
+      },
+      closeFormDialog: function () {
+        this.clearFormDialoglnurldevice()
+        this.formDialog.data = {
+          is_unique: false
+        }
+      },
+      sendFormDatalnurldevice: function () {
+        var self = this
+        if (self.formDialoglnurldevice.data.id) {
+          this.updatelnurldevice(
+            self.g.user.wallets[0].adminkey,
+            self.formDialoglnurldevice.data
+          )
+        } else {
+          this.createlnurldevice(
+            self.g.user.wallets[0].adminkey,
+            self.formDialoglnurldevice.data
+          )
+        }
+      },
+
+      createlnurldevice: function (wallet, data) {
+        var self = this
+        var updatedData = {}
+        for (const property in data) {
+          if (data[property]) {
+            updatedData[property] = data[property]
+          }
+        }
+        LNbits.api
+          .request('POST', '/lnurldevice/api/v1/lnurlpos', wallet, updatedData)
+          .then(function (response) {
+            self.lnurldeviceLinks.push(maplnurldevice(response.data))
+            self.formDialoglnurldevice.show = false
+            self.clearFormDialoglnurldevice()
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getlnurldevices: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/lnurldevice/api/v1/lnurlpos',
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.lnurldeviceLinks = response.data.map(maplnurldevice)
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getlnurldevice: function (lnurldevice_id) {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/lnurldevice/api/v1/lnurlpos/' + lnurldevice_id,
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            localStorage.setItem('lnurldevice', JSON.stringify(response.data))
+            localStorage.setItem('inkey', self.g.user.wallets[0].inkey)
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      deletelnurldeviceLink: function (lnurldeviceId) {
+        var self = this
+        var link = _.findWhere(this.lnurldeviceLinks, {id: lnurldeviceId})
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this pay link?')
+          .onOk(function () {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/lnurldevice/api/v1/lnurlpos/' + lnurldeviceId,
+                self.g.user.wallets[0].adminkey
+              )
+              .then(function (response) {
+                self.lnurldeviceLinks = _.reject(
+                  self.lnurldeviceLinks,
+                  function (obj) {
+                    return obj.id === lnurldeviceId
+                  }
+                )
+              })
+              .catch(function (error) {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      openUpdatelnurldeviceLink: function (lnurldeviceId) {
+        var self = this
+        var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
+          id: lnurldeviceId
+        })
+        self.formDialoglnurldevice.data = _.clone(lnurldevice._data)
+        self.formDialoglnurldevice.show = true
+      },
+      openlnurldeviceSettings: function (lnurldeviceId) {
+        var self = this
+        var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
+          id: lnurldeviceId
+        })
+        self.settingsDialog.data = _.clone(lnurldevice._data)
+        self.settingsDialog.show = true
+      },
+      updatelnurldevice: function (wallet, data) {
+        var self = this
+        var updatedData = {}
+        for (const property in data) {
+          if (data[property]) {
+            updatedData[property] = data[property]
+          }
+        }
+
+        LNbits.api
+          .request(
+            'PUT',
+            '/lnurldevice/api/v1/lnurlpos/' + updatedData.id,
+            wallet,
+            updatedData
+          )
+          .then(function (response) {
+            self.lnurldeviceLinks = _.reject(
+              self.lnurldeviceLinks,
+              function (obj) {
+                return obj.id === updatedData.id
+              }
+            )
+            self.lnurldeviceLinks.push(maplnurldevice(response.data))
+            self.formDialoglnurldevice.show = false
+            self.clearFormDialoglnurldevice()
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      clearFormDialoglnurldevice() {
+        this.formDialoglnurldevice.data = {
+          lnurl_toggle: false,
+          show_message: false,
+          show_ack: false,
+          show_price: 'None',
+          title: ''
+        }
+      },
+      exportlnurldeviceCSV: function () {
+        var self = this
+        LNbits.utils.exportCSV(
+          self.lnurldevicesTable.columns,
+          this.lnurldeviceLinks
+        )
+      }
+    },
+    created: function () {
+      var self = this
+      var getlnurldevices = this.getlnurldevices
+      getlnurldevices()
+      self.location = [
+        window.location.protocol,
+        '//',
+        window.location.host
+      ].join('')
+      LNbits.api
+        .request('GET', '/api/v1/currencies')
+        .then(response => {
+          this.currency = ['USD', ...response.data]
+        })
+        .catch(err => {
+          LNbits.utils.notifyApiError(err)
+        })
+    }
+  })
+</script>
+{% endblock %}
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/paid.html b/lnbits/extensions/nostr/templates/lnurldevice/paid.html
new file mode 100644
index 00000000..c185ecce
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/lnurldevice/paid.html
@@ -0,0 +1,27 @@
+{% extends "public.html" %} {% block page %}
+<div class="row q-col-gutter-md justify-center">
+  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
+    <q-card class="q-pa-lg">
+      <q-card-section class="q-pa-none">
+        <center>
+          <h3 class="q-my-none">{{ pin }}</h3>
+          <br />
+        </center>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  {% endblock %} {% block scripts %}
+
+  <script>
+    new Vue({
+      el: '#vue',
+      mixins: [windowMixin],
+      data: function () {
+        return {}
+      }
+    })
+  </script>
+
+  {% endblock %}
+</div>
diff --git a/lnbits/extensions/nostr/views.py b/lnbits/extensions/nostr/views.py
new file mode 100644
index 00000000..1dfc07da
--- /dev/null
+++ b/lnbits/extensions/nostr/views.py
@@ -0,0 +1,24 @@
+from http import HTTPStatus
+
+from fastapi import Request
+from fastapi.param_functions import Query
+from fastapi.params import Depends
+from fastapi.templating import Jinja2Templates
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+
+from lnbits.core.crud import update_payment_status
+from lnbits.core.models import User
+from lnbits.core.views.api import api_payment
+from lnbits.decorators import check_user_exists
+
+from . import nostr_ext, nostr_renderer
+
+templates = Jinja2Templates(directory="templates")
+
+
+@nostr_ext.get("/", response_class=HTMLResponse)
+async def index(request: Request, user: User = Depends(check_user_exists)):
+    return nostr_renderer().TemplateResponse(
+        "nostr/index.html", {"request": request, "user": user.dict()}
+    )
diff --git a/lnbits/extensions/nostr/views_api.py b/lnbits/extensions/nostr/views_api.py
new file mode 100644
index 00000000..a479cad8
--- /dev/null
+++ b/lnbits/extensions/nostr/views_api.py
@@ -0,0 +1,48 @@
+from http import HTTPStatus
+
+from fastapi import Request
+from fastapi.param_functions import Query
+from fastapi.params import Depends
+from starlette.exceptions import HTTPException
+
+from lnbits.core.crud import get_user
+from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
+from lnbits.extensions.lnurldevice import lnurldevice_ext
+from lnbits.utils.exchange_rates import currencies
+
+from . import lnurldevice_ext
+from .crud import (
+    create_lnurldevice,
+    delete_lnurldevice,
+    get_lnurldevice,
+    get_lnurldevices,
+    update_lnurldevice,
+)
+from .models import createLnurldevice
+
+
+@nostr_ext.get("/api/v1/lnurlpos")
+async def api_check_daemon(wallet: WalletTypeInfo = Depends(get_key_type)):
+    wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+    try:
+        return [
+            {**lnurldevice.dict()} for lnurldevice in await get_lnurldevices(wallet_ids)
+        ]
+    except:
+        return ""
+
+@nostr_ext.delete("/api/v1/lnurlpos/{lnurldevice_id}")
+async def api_lnurldevice_delete(
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+    lnurldevice_id: str = Query(None),
+):
+    lnurldevice = await get_lnurldevice(lnurldevice_id)
+
+    if not lnurldevice:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Wallet link does not exist."
+        )
+
+    await delete_lnurldevice(lnurldevice_id)
+
+    return "", HTTPStatus.NO_CONTENT
\ No newline at end of file

From d60d5c928cf7b7479c8232b06b9430ad21d189bf Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Mon, 7 Feb 2022 20:01:01 +0000
Subject: [PATCH 042/174] extension loading

---
 lnbits/extensions/nostr/__init__.py           |   2 -
 lnbits/extensions/nostr/crud.py               |  71 +--
 lnbits/extensions/nostr/migrations.py         |   2 +-
 lnbits/extensions/nostr/models.py             |  12 +-
 .../templates/lnurldevice/_api_docs.html      | 169 ------
 .../nostr/templates/lnurldevice/error.html    |  34 --
 .../nostr/templates/lnurldevice/index.html    | 534 ------------------
 .../nostr/templates/lnurldevice/paid.html     |  27 -
 .../nostr/templates/nostr/index.html          | 159 ++++++
 lnbits/extensions/nostr/views_api.py          |  46 +-
 10 files changed, 204 insertions(+), 852 deletions(-)
 delete mode 100644 lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
 delete mode 100644 lnbits/extensions/nostr/templates/lnurldevice/error.html
 delete mode 100644 lnbits/extensions/nostr/templates/lnurldevice/index.html
 delete mode 100644 lnbits/extensions/nostr/templates/lnurldevice/paid.html
 create mode 100644 lnbits/extensions/nostr/templates/nostr/index.html

diff --git a/lnbits/extensions/nostr/__init__.py b/lnbits/extensions/nostr/__init__.py
index 775960e3..9774a279 100644
--- a/lnbits/extensions/nostr/__init__.py
+++ b/lnbits/extensions/nostr/__init__.py
@@ -11,7 +11,5 @@ nostr_ext: APIRouter = APIRouter(prefix="/nostr", tags=["nostr"])
 def nostr_renderer():
     return template_renderer(["lnbits/extensions/nostr/templates"])
 
-
-from .lnurl import *  # noqa
 from .views import *  # noqa
 from .views_api import *  # noqa
diff --git a/lnbits/extensions/nostr/crud.py b/lnbits/extensions/nostr/crud.py
index 55e99ec6..0b30bc9a 100644
--- a/lnbits/extensions/nostr/crud.py
+++ b/lnbits/extensions/nostr/crud.py
@@ -1,33 +1,31 @@
 from typing import List, Optional, Union
 
 from lnbits.helpers import urlsafe_short_hash
-
+import shortuuid
 from . import db
-from .models import nostrKeys, nostrNotes, nostrRelays, nostrConnections
+from .models import nostrKeys, nostrNotes, nostrCreateRelays, nostrRelays, nostrConnections, nostrCreateConnections
 
 ###############KEYS##################
 
 async def create_nostrkeys(
     data: nostrKeys
 ) -> nostrKeys:
-    nostrkey_id = urlsafe_short_hash()
     await db.execute(
         """
         INSERT INTO nostr.keys (
-            id,
             pubkey,
             privkey
         )
-        VALUES (?, ?, ?)
+        VALUES (?, ?)
         """,
-        (nostrkey_id, data.pubkey, data.privkey),
+        (data.pubkey, data.privkey),
     )
     return await get_nostrkeys(nostrkey_id)
 
-async def get_nostrkeys(nostrkey_id: str) -> nostrKeys:
+async def get_nostrkeys(pubkey: str) -> nostrKeys:
     row = await db.fetchone(
-        "SELECT * FROM nostr.keys WHERE id = ?",
-        (lnurldevicepayment_id,),
+        "SELECT * FROM nostr.keys WHERE pubkey = ?",
+        (pubkey,),
     )
     return nostrKeys(**row) if row else None
 
@@ -64,9 +62,12 @@ async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
 ###############RELAYS##################
 
 async def create_nostrrelays(
-    relay: str
-) -> nostrRelays:
-    nostrrelay_id = urlsafe_short_hash()
+    data: nostrCreateRelays
+) -> nostrCreateRelays:
+    nostrrelay_id = shortuuid.uuid(name=relay)
+    
+    if await get_nostrrelays(nostrrelay_id):
+        return "error"
     await db.execute(
         """
         INSERT INTO nostr.relays (
@@ -75,7 +76,7 @@ async def create_nostrrelays(
         )
         VALUES (?, ?)
         """,
-        (nostrrelay_id, relay),
+        (nostrrelay_id, data.relay),
     )
     return await get_nostrnotes(nostrrelay_id)
 
@@ -90,45 +91,25 @@ async def get_nostrrelays(nostrrelay_id: str) -> nostrRelays:
 ###############CONNECTIONS##################
 
 async def create_nostrconnections(
-    data: nostrNotes
-) -> nostrNotes:
-    nostrkey_id = urlsafe_short_hash()
+    data: nostrCreateConnections
+) -> nostrCreateConnections:
+    nostrrelay_id = shortuuid.uuid(name=data.relayid + data.pubkey)
     await db.execute(
         """
-        INSERT INTO nostr.notes (
+        INSERT INTO nostr.connections (
             id,
             pubkey,
-            created_at,
-            kind,
-            tags,
-            content,
-            sig
+            relayid
         )
-        VALUES (?, ?, ?, ?, ?, ?, ?)
+        VALUES (?, ?, ?)
         """,
-        (data.id, data.pubkey, data.created_at, data.kind, data.tags, data.content, data.sig),
+        (data.id, data.pubkey, data.relayid),
     )
-    return await get_nostrnotes(data.id)
+    return await get_nostrconnections(data.id)
 
-async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
+async def get_nostrconnections(nostrconnections_id: str) -> nostrConnections:
     row = await db.fetchone(
-        "SELECT * FROM nostr.notes WHERE id = ?",
-        (nostrnote_id,),
+        "SELECT * FROM nostr.connections WHERE id = ?",
+        (nostrconnections_id,),
     )
-    return nostrNotes(**row) if row else None
-
-
-
-async def update_lnurldevicepayment(
-    lnurldevicepayment_id: str, **kwargs
-) -> Optional[lnurldevicepayment]:
-    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(
-        f"UPDATE lnurldevice.lnurldevicepayment SET {q} WHERE id = ?",
-        (*kwargs.values(), lnurldevicepayment_id),
-    )
-    row = await db.fetchone(
-        "SELECT * FROM lnurldevice.lnurldevicepayment WHERE id = ?",
-        (lnurldevicepayment_id,),
-    )
-    return lnurldevicepayment(**row) if row else None
\ No newline at end of file
+    return nostrConnections(**row) if row else None
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/migrations.py b/lnbits/extensions/nostr/migrations.py
index de32a578..0c616110 100644
--- a/lnbits/extensions/nostr/migrations.py
+++ b/lnbits/extensions/nostr/migrations.py
@@ -24,7 +24,7 @@ async def m001_initial(db):
             kind INT NOT NULL,
             tags TEXT NOT NULL,
             content TEXT NOT NULL,
-            sig TEXT NOT NULL,
+            sig TEXT NOT NULL
         );
     """
     )
diff --git a/lnbits/extensions/nostr/models.py b/lnbits/extensions/nostr/models.py
index ba0c87a5..e21e5d76 100644
--- a/lnbits/extensions/nostr/models.py
+++ b/lnbits/extensions/nostr/models.py
@@ -3,15 +3,10 @@ from sqlite3 import Row
 from typing import Optional
 
 from fastapi import Request
-from lnurl import Lnurl
-from lnurl import encode as lnurl_encode  # type: ignore
-from lnurl.models import LnurlPaySuccessAction, UrlAction  # type: ignore
-from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
 from pydantic.main import BaseModel
 
 class nostrKeys(BaseModel):
-    id: str
     pubkey: str
     privkey: str
 
@@ -24,6 +19,13 @@ class nostrNotes(BaseModel):
     content: str
     sig: str
 
+class nostrCreateRelays(BaseModel):
+    relay: str
+
+class nostrCreateConnections(BaseModel):
+    pubkey: str
+    relayid: str
+
 class nostrRelays(BaseModel):
     id: str
     relay: str
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html b/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
deleted file mode 100644
index af69b76e..00000000
--- a/lnbits/extensions/nostr/templates/lnurldevice/_api_docs.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<q-card>
-  <q-card-section>
-    <p>
-      Register LNURLDevice devices to receive payments in your LNbits wallet.<br />
-      Build your own here
-      <a href="https://github.com/arcbtc/bitcoinpos"
-        >https://github.com/arcbtc/bitcoinpos</a
-      ><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 lnurldevice"
-    >
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue"></span> /lnurldevice/api/v1/lnurlpos</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;lnurldevice_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X POST {{ request.base_url }}api/v1/lnurldevice -d '{"title":
-            &lt;string&gt;, "message":&lt;string&gt;, "currency":
-            &lt;integer&gt;}' -H "Content-type: application/json" -H "X-Api-Key:
-            {{user.wallets[0].adminkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-    <q-expansion-item
-      group="api"
-      dense
-      expand-separator
-      label="Update lnurldevice"
-    >
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue">PUT</span>
-            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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;lnurldevice_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X POST {{ request.base_url
-            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -d ''{"title":
-            &lt;string&gt;, "message":&lt;string&gt;, "currency":
-            &lt;integer&gt;} -H "Content-type: application/json" -H "X-Api-Key:
-            {{user.wallets[0].adminkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-
-    <q-expansion-item
-      group="api"
-      dense
-      expand-separator
-      label="Get lnurldevice"
-    >
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue">GET</span>
-            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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;lnurldevice_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X GET {{ request.base_url
-            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -H "X-Api-Key: {{
-            user.wallets[0].inkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-    <q-expansion-item
-      group="api"
-      dense
-      expand-separator
-      label="Get lnurldevices"
-    >
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue">GET</span>
-            /lnurldevice/api/v1/lnurlposs</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;lnurldevice_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X GET {{ request.base_url }}api/v1/lnurldevices -H
-            "X-Api-Key: {{ 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>
-            /lnurldevice/api/v1/lnurlpos/&lt;lnurldevice_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.base_url
-            }}api/v1/lnurlpos/&lt;lnurldevice_id&gt; -H "X-Api-Key: {{
-            user.wallets[0].adminkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-  </q-expansion-item>
-</q-card>
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/error.html b/lnbits/extensions/nostr/templates/lnurldevice/error.html
deleted file mode 100644
index d8e41832..00000000
--- a/lnbits/extensions/nostr/templates/lnurldevice/error.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "public.html" %} {% block page %}
-<div class="row q-col-gutter-md justify-center">
-  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
-    <q-card class="q-pa-lg">
-      <q-card-section class="q-pa-none">
-        <center>
-          <h3 class="q-my-none">LNURL-pay not paid</h3>
-          <br />
-          <q-icon
-            name="warning"
-            class="text-grey"
-            style="font-size: 20rem"
-          ></q-icon>
-
-          <br />
-        </center>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  {% endblock %} {% block scripts %}
-
-  <script>
-    new Vue({
-      el: '#vue',
-      mixins: [windowMixin],
-      data: function () {
-        return {}
-      }
-    })
-  </script>
-
-  {% endblock %}
-</div>
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/index.html b/lnbits/extensions/nostr/templates/lnurldevice/index.html
deleted file mode 100644
index b51e2556..00000000
--- a/lnbits/extensions/nostr/templates/lnurldevice/index.html
+++ /dev/null
@@ -1,534 +0,0 @@
-{% 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="formDialoglnurldevice.show = true"
-          >New LNURLDevice 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">lNURLdevice</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="exportlnurldeviceCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          flat
-          dense
-          :data="lnurldeviceLinks"
-          row-key="id"
-          :columns="lnurldevicesTable.columns"
-          :pagination.sync="lnurldevicesTable.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
-                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>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deletelnurldeviceLink(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                >
-                  <q-tooltip> Delete LNURLDevice </q-tooltip>
-                </q-btn>
-              </q-td>
-              <q-td>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="openlnurldeviceSettings(props.row.id)"
-                  icon="perm_data_setting"
-                  color="primary"
-                >
-                  <q-tooltip> LNURLDevice Settings </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">
-          {{SITE_TITLE}} LNURLDevice Extension
-        </h6>
-      </q-card-section>
-      <q-card-section class="q-pa-none">
-        <q-separator></q-separator>
-        <q-list> {% include "lnurldevice/_api_docs.html" %} </q-list>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  <q-dialog
-    v-model="settingsDialog.show"
-    deviceition="top"
-    @hide="closeFormDialog"
-  >
-    <q-card
-      style="width: 700px; max-width: 80vw"
-      class="q-pa-lg q-pt-xl lnbits__dialog-card"
-    >
-      <div class="text-h6">LNURLDevice device string</div>
-      <q-btn
-        dense
-        outline
-        unelevated
-        color="primary"
-        size="md"
-        @click="copyText(location + '/lnurldevice/api/v1/lnurl/' + settingsDialog.data.id + ',' +
-      settingsDialog.data.key + ',' + settingsDialog.data.currency, 'Link copied to clipboard!')"
-        >{% raw
-        %}{{location}}/lnurldevice/api/v1/lnurl/{{settingsDialog.data.id}},
-        {{settingsDialog.data.key}}, {{settingsDialog.data.currency}}{% endraw
-        %}<q-tooltip> Click to copy URL </q-tooltip>
-      </q-btn>
-
-      <div class="text-subtitle2">
-        <small> </small>
-      </div>
-    </q-card>
-  </q-dialog>
-
-  <q-dialog
-    v-model="formDialoglnurldevice.show"
-    deviceition="top"
-    @hide="closeFormDialog"
-  >
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="sendFormDatalnurldevice" class="q-gutter-md">
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialoglnurldevice.data.title"
-          type="text"
-          label="Title"
-        ></q-input>
-
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialoglnurldevice.data.wallet"
-          :options="g.user.walletOptions"
-          label="Wallet *"
-        ></q-select>
-
-        <q-select
-          filled
-          dense
-          v-model.trim="formDialoglnurldevice.data.currency"
-          type="text"
-          label="Fiat currency for device"
-          :options="currency"
-        ></q-select>
-        <q-option-group
-          v-model.trim="formDialoglnurldevice.data.device"
-          :options="devices"
-          color="primary"
-          label="Type of device"
-        ></q-option-group>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialoglnurldevice.data.profit"
-          type="number"
-          max="90"
-          label="Profit margin (% added to invoices/deducted from faucets)"
-        ></q-input>
-
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="formDialoglnurldevice.data.id"
-            unelevated
-            color="primary"
-            :disable="
-                formDialoglnurldevice.data.title == ''"
-            type="submit"
-            >Update lnurldevice</q-btn
-          >
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="
-                formDialoglnurldevice.data.title == ''"
-            type="submit"
-            >Create lnurldevice</q-btn
-          >
-          <q-btn @click="cancellnurldevice" 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>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  var maplnurldevice = 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'
-      )
-    }
-    return obj
-  }
-
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        location: window.location.hostname,
-        filter: '',
-        currency: 'USD',
-        lnurldeviceLinks: [],
-        lnurldeviceLinksObj: [],
-        devices: [
-          {
-            label: 'PoS',
-            value: 'pos'
-          },
-          {
-            label: 'ATM',
-            value: 'atm'
-          }
-        ],
-        lnurldevicesTable: {
-          columns: [
-            {
-              name: 'title',
-              align: 'left',
-              label: 'title',
-              field: 'title'
-            },
-            {
-              name: 'theId',
-              align: 'left',
-              label: 'id',
-              field: 'id'
-            },
-            {
-              name: 'key',
-              align: 'left',
-              label: 'key',
-              field: 'key'
-            },
-            {
-              name: 'wallet',
-              align: 'left',
-              label: 'wallet',
-              field: 'wallet'
-            },
-            {
-              name: 'device',
-              align: 'left',
-              label: 'device',
-              field: 'device'
-            },
-            {
-              name: 'profit',
-              align: 'left',
-              label: 'profit',
-              field: 'profit'
-            },
-            {
-              name: 'currency',
-              align: 'left',
-              label: 'currency',
-              field: 'currency'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        passedlnurldevice: {},
-        settingsDialog: {
-          show: false,
-          data: {}
-        },
-        formDialog: {
-          show: false,
-          data: {}
-        },
-        formDialoglnurldevice: {
-          show: false,
-          data: {
-            lnurl_toggle: false,
-            show_message: false,
-            show_ack: false,
-            show_price: 'None',
-            device: 'pos',
-            profit: 2,
-            title: ''
-          }
-        },
-        qrCodeDialog: {
-          show: false,
-          data: null
-        }
-      }
-    },
-    methods: {
-      cancellnurldevice: function (data) {
-        var self = this
-        self.formDialoglnurldevice.show = false
-        self.clearFormDialoglnurldevice()
-      },
-      closeFormDialog: function () {
-        this.clearFormDialoglnurldevice()
-        this.formDialog.data = {
-          is_unique: false
-        }
-      },
-      sendFormDatalnurldevice: function () {
-        var self = this
-        if (self.formDialoglnurldevice.data.id) {
-          this.updatelnurldevice(
-            self.g.user.wallets[0].adminkey,
-            self.formDialoglnurldevice.data
-          )
-        } else {
-          this.createlnurldevice(
-            self.g.user.wallets[0].adminkey,
-            self.formDialoglnurldevice.data
-          )
-        }
-      },
-
-      createlnurldevice: function (wallet, data) {
-        var self = this
-        var updatedData = {}
-        for (const property in data) {
-          if (data[property]) {
-            updatedData[property] = data[property]
-          }
-        }
-        LNbits.api
-          .request('POST', '/lnurldevice/api/v1/lnurlpos', wallet, updatedData)
-          .then(function (response) {
-            self.lnurldeviceLinks.push(maplnurldevice(response.data))
-            self.formDialoglnurldevice.show = false
-            self.clearFormDialoglnurldevice()
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getlnurldevices: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/lnurldevice/api/v1/lnurlpos',
-            self.g.user.wallets[0].adminkey
-          )
-          .then(function (response) {
-            if (response.data) {
-              self.lnurldeviceLinks = response.data.map(maplnurldevice)
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getlnurldevice: function (lnurldevice_id) {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/lnurldevice/api/v1/lnurlpos/' + lnurldevice_id,
-            self.g.user.wallets[0].adminkey
-          )
-          .then(function (response) {
-            localStorage.setItem('lnurldevice', JSON.stringify(response.data))
-            localStorage.setItem('inkey', self.g.user.wallets[0].inkey)
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      deletelnurldeviceLink: function (lnurldeviceId) {
-        var self = this
-        var link = _.findWhere(this.lnurldeviceLinks, {id: lnurldeviceId})
-        LNbits.utils
-          .confirmDialog('Are you sure you want to delete this pay link?')
-          .onOk(function () {
-            LNbits.api
-              .request(
-                'DELETE',
-                '/lnurldevice/api/v1/lnurlpos/' + lnurldeviceId,
-                self.g.user.wallets[0].adminkey
-              )
-              .then(function (response) {
-                self.lnurldeviceLinks = _.reject(
-                  self.lnurldeviceLinks,
-                  function (obj) {
-                    return obj.id === lnurldeviceId
-                  }
-                )
-              })
-              .catch(function (error) {
-                LNbits.utils.notifyApiError(error)
-              })
-          })
-      },
-      openUpdatelnurldeviceLink: function (lnurldeviceId) {
-        var self = this
-        var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
-          id: lnurldeviceId
-        })
-        self.formDialoglnurldevice.data = _.clone(lnurldevice._data)
-        self.formDialoglnurldevice.show = true
-      },
-      openlnurldeviceSettings: function (lnurldeviceId) {
-        var self = this
-        var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
-          id: lnurldeviceId
-        })
-        self.settingsDialog.data = _.clone(lnurldevice._data)
-        self.settingsDialog.show = true
-      },
-      updatelnurldevice: function (wallet, data) {
-        var self = this
-        var updatedData = {}
-        for (const property in data) {
-          if (data[property]) {
-            updatedData[property] = data[property]
-          }
-        }
-
-        LNbits.api
-          .request(
-            'PUT',
-            '/lnurldevice/api/v1/lnurlpos/' + updatedData.id,
-            wallet,
-            updatedData
-          )
-          .then(function (response) {
-            self.lnurldeviceLinks = _.reject(
-              self.lnurldeviceLinks,
-              function (obj) {
-                return obj.id === updatedData.id
-              }
-            )
-            self.lnurldeviceLinks.push(maplnurldevice(response.data))
-            self.formDialoglnurldevice.show = false
-            self.clearFormDialoglnurldevice()
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      clearFormDialoglnurldevice() {
-        this.formDialoglnurldevice.data = {
-          lnurl_toggle: false,
-          show_message: false,
-          show_ack: false,
-          show_price: 'None',
-          title: ''
-        }
-      },
-      exportlnurldeviceCSV: function () {
-        var self = this
-        LNbits.utils.exportCSV(
-          self.lnurldevicesTable.columns,
-          this.lnurldeviceLinks
-        )
-      }
-    },
-    created: function () {
-      var self = this
-      var getlnurldevices = this.getlnurldevices
-      getlnurldevices()
-      self.location = [
-        window.location.protocol,
-        '//',
-        window.location.host
-      ].join('')
-      LNbits.api
-        .request('GET', '/api/v1/currencies')
-        .then(response => {
-          this.currency = ['USD', ...response.data]
-        })
-        .catch(err => {
-          LNbits.utils.notifyApiError(err)
-        })
-    }
-  })
-</script>
-{% endblock %}
diff --git a/lnbits/extensions/nostr/templates/lnurldevice/paid.html b/lnbits/extensions/nostr/templates/lnurldevice/paid.html
deleted file mode 100644
index c185ecce..00000000
--- a/lnbits/extensions/nostr/templates/lnurldevice/paid.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "public.html" %} {% block page %}
-<div class="row q-col-gutter-md justify-center">
-  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
-    <q-card class="q-pa-lg">
-      <q-card-section class="q-pa-none">
-        <center>
-          <h3 class="q-my-none">{{ pin }}</h3>
-          <br />
-        </center>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  {% endblock %} {% block scripts %}
-
-  <script>
-    new Vue({
-      el: '#vue',
-      mixins: [windowMixin],
-      data: function () {
-        return {}
-      }
-    })
-  </script>
-
-  {% endblock %}
-</div>
diff --git a/lnbits/extensions/nostr/templates/nostr/index.html b/lnbits/extensions/nostr/templates/nostr/index.html
new file mode 100644
index 00000000..f17d0243
--- /dev/null
+++ b/lnbits/extensions/nostr/templates/nostr/index.html
@@ -0,0 +1,159 @@
+{% 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>
+        <div class="row items-center no-wrap q-mb-md">
+          <div class="col">
+            <h5 class="text-subtitle1 q-my-none">Nostr</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="exportlnurldeviceCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          flat
+          dense
+          :data="lnurldeviceLinks"
+          row-key="id"
+          :columns="nostrTable.columns"
+          :pagination.sync="nostrTable.pagination"
+          :filter="filter"
+        >
+          {% raw %}
+          <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
+                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
+                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">{{SITE_TITLE}} Nostr Extension</h6>
+
+        <q-card-section>Okay </q-card-section>
+      </q-card-section>
+    </q-card>
+  </div>
+</div>
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+
+  var maplnurldevice = 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'
+      )
+    }
+    return obj
+  }
+
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        nostrTable: {
+          columns: [
+            {
+              name: 'relay',
+              align: 'left',
+              label: 'relay',
+              field: 'relay'
+            },
+            {
+              name: 'connected',
+              align: 'left',
+              label: 'connected',
+              field: 'connected'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        }
+      }
+    },
+    methods: {
+      getrelays: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/nostr/api/v1/relays',
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.lnurldeviceLinks = response.data.map(maplnurldevice)
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      }
+    },
+    created: function () {
+      var self = this
+      var getrelays = this.getrelays
+      getrelays()
+    }
+  })
+</script>
+{% endblock %}
diff --git a/lnbits/extensions/nostr/views_api.py b/lnbits/extensions/nostr/views_api.py
index a479cad8..9e7ccfff 100644
--- a/lnbits/extensions/nostr/views_api.py
+++ b/lnbits/extensions/nostr/views_api.py
@@ -7,42 +7,18 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnbits.extensions.lnurldevice import lnurldevice_ext
+from lnbits.extensions.nostr import nostr_ext
 from lnbits.utils.exchange_rates import currencies
 
-from . import lnurldevice_ext
+from . import nostr_ext
 from .crud import (
-    create_lnurldevice,
-    delete_lnurldevice,
-    get_lnurldevice,
-    get_lnurldevices,
-    update_lnurldevice,
+    create_nostrkeys,
+    get_nostrkeys,
+    create_nostrnotes,
+    get_nostrnotes,
+    create_nostrrelays,
+    get_nostrrelays,
+    create_nostrconnections,
+    get_nostrconnections,
 )
-from .models import createLnurldevice
-
-
-@nostr_ext.get("/api/v1/lnurlpos")
-async def api_check_daemon(wallet: WalletTypeInfo = Depends(get_key_type)):
-    wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
-    try:
-        return [
-            {**lnurldevice.dict()} for lnurldevice in await get_lnurldevices(wallet_ids)
-        ]
-    except:
-        return ""
-
-@nostr_ext.delete("/api/v1/lnurlpos/{lnurldevice_id}")
-async def api_lnurldevice_delete(
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-    lnurldevice_id: str = Query(None),
-):
-    lnurldevice = await get_lnurldevice(lnurldevice_id)
-
-    if not lnurldevice:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Wallet link does not exist."
-        )
-
-    await delete_lnurldevice(lnurldevice_id)
-
-    return "", HTTPStatus.NO_CONTENT
\ No newline at end of file
+from .models import nostrKeys
\ No newline at end of file

From 30f9c3d290e9198e6585109d2fb5d19479b214e1 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Tue, 8 Feb 2022 10:35:20 +0000
Subject: [PATCH 043/174] Chnaged nostr to nostradmin

---
 .env.example                                  |   2 +-
 lnbits/extensions/nostr/config.json           |   6 -
 lnbits/extensions/nostr/crud.py               | 115 -------------
 lnbits/extensions/nostr/views_api.py          |  24 ---
 .../{nostr => nostradmin}/README.md           |   0
 .../{nostr => nostradmin}/__init__.py         |   7 +-
 lnbits/extensions/nostradmin/config.json      |   6 +
 lnbits/extensions/nostradmin/crud.py          | 156 ++++++++++++++++++
 .../{nostr => nostradmin}/migrations.py       |  32 +++-
 .../{nostr => nostradmin}/models.py           |  14 +-
 .../templates/nostradmin}/index.html          | 130 ++++++++++++++-
 .../extensions/{nostr => nostradmin}/views.py |   2 +-
 lnbits/extensions/nostradmin/views_api.py     |  87 ++++++++++
 13 files changed, 421 insertions(+), 160 deletions(-)
 delete mode 100644 lnbits/extensions/nostr/config.json
 delete mode 100644 lnbits/extensions/nostr/crud.py
 delete mode 100644 lnbits/extensions/nostr/views_api.py
 rename lnbits/extensions/{nostr => nostradmin}/README.md (100%)
 rename lnbits/extensions/{nostr => nostradmin}/__init__.py (51%)
 create mode 100644 lnbits/extensions/nostradmin/config.json
 create mode 100644 lnbits/extensions/nostradmin/crud.py
 rename lnbits/extensions/{nostr => nostradmin}/migrations.py (54%)
 rename lnbits/extensions/{nostr => nostradmin}/models.py (73%)
 rename lnbits/extensions/{nostr/templates/nostr => nostradmin/templates/nostradmin}/index.html (50%)
 rename lnbits/extensions/{nostr => nostradmin}/views.py (90%)
 create mode 100644 lnbits/extensions/nostradmin/views_api.py

diff --git a/.env.example b/.env.example
index 6ef60bc1..5926ee65 100644
--- a/.env.example
+++ b/.env.example
@@ -6,7 +6,7 @@ DEBUG=false
 LNBITS_ALLOWED_USERS=""
 LNBITS_ADMIN_USERS=""
 # Extensions only admin can access
-LNBITS_ADMIN_EXTENSIONS="ngrok"
+LNBITS_ADMIN_EXTENSIONS="nostradmin"
 LNBITS_DEFAULT_WALLET_NAME="LNbits wallet"
 
 LNBITS_AD_SPACE="" # csv ad image filepaths or urls, extensions can choose to honor
diff --git a/lnbits/extensions/nostr/config.json b/lnbits/extensions/nostr/config.json
deleted file mode 100644
index a32e39a1..00000000
--- a/lnbits/extensions/nostr/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "Nostr",
-  "short_description": "Daemon for Nostr",
-  "icon": "swap_horizontal_circle",
-  "contributors": ["arcbtc"]
-}
diff --git a/lnbits/extensions/nostr/crud.py b/lnbits/extensions/nostr/crud.py
deleted file mode 100644
index 0b30bc9a..00000000
--- a/lnbits/extensions/nostr/crud.py
+++ /dev/null
@@ -1,115 +0,0 @@
-from typing import List, Optional, Union
-
-from lnbits.helpers import urlsafe_short_hash
-import shortuuid
-from . import db
-from .models import nostrKeys, nostrNotes, nostrCreateRelays, nostrRelays, nostrConnections, nostrCreateConnections
-
-###############KEYS##################
-
-async def create_nostrkeys(
-    data: nostrKeys
-) -> nostrKeys:
-    await db.execute(
-        """
-        INSERT INTO nostr.keys (
-            pubkey,
-            privkey
-        )
-        VALUES (?, ?)
-        """,
-        (data.pubkey, data.privkey),
-    )
-    return await get_nostrkeys(nostrkey_id)
-
-async def get_nostrkeys(pubkey: str) -> nostrKeys:
-    row = await db.fetchone(
-        "SELECT * FROM nostr.keys WHERE pubkey = ?",
-        (pubkey,),
-    )
-    return nostrKeys(**row) if row else None
-
-
-###############NOTES##################
-
-async def create_nostrnotes(
-    data: nostrNotes
-) -> nostrNotes:
-    await db.execute(
-        """
-        INSERT INTO nostr.notes (
-            id,
-            pubkey,
-            created_at,
-            kind,
-            tags,
-            content,
-            sig
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?)
-        """,
-        (data.id, data.pubkey, data.created_at, data.kind, data.tags, data.content, data.sig),
-    )
-    return await get_nostrnotes(data.id)
-
-async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
-    row = await db.fetchone(
-        "SELECT * FROM nostr.notes WHERE id = ?",
-        (nostrnote_id,),
-    )
-    return nostrNotes(**row) if row else None
-
-###############RELAYS##################
-
-async def create_nostrrelays(
-    data: nostrCreateRelays
-) -> nostrCreateRelays:
-    nostrrelay_id = shortuuid.uuid(name=relay)
-    
-    if await get_nostrrelays(nostrrelay_id):
-        return "error"
-    await db.execute(
-        """
-        INSERT INTO nostr.relays (
-            id,
-            relay
-        )
-        VALUES (?, ?)
-        """,
-        (nostrrelay_id, data.relay),
-    )
-    return await get_nostrnotes(nostrrelay_id)
-
-async def get_nostrrelays(nostrrelay_id: str) -> nostrRelays:
-    row = await db.fetchone(
-        "SELECT * FROM nostr.relays WHERE id = ?",
-        (nostrnote_id,),
-    )
-    return nostrRelays(**row) if row else None
-
-
-###############CONNECTIONS##################
-
-async def create_nostrconnections(
-    data: nostrCreateConnections
-) -> nostrCreateConnections:
-    nostrrelay_id = shortuuid.uuid(name=data.relayid + data.pubkey)
-    await db.execute(
-        """
-        INSERT INTO nostr.connections (
-            id,
-            pubkey,
-            relayid
-        )
-        VALUES (?, ?, ?)
-        """,
-        (data.id, data.pubkey, data.relayid),
-    )
-    return await get_nostrconnections(data.id)
-
-async def get_nostrconnections(nostrconnections_id: str) -> nostrConnections:
-    row = await db.fetchone(
-        "SELECT * FROM nostr.connections WHERE id = ?",
-        (nostrconnections_id,),
-    )
-    return nostrConnections(**row) if row else None
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/views_api.py b/lnbits/extensions/nostr/views_api.py
deleted file mode 100644
index 9e7ccfff..00000000
--- a/lnbits/extensions/nostr/views_api.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from http import HTTPStatus
-
-from fastapi import Request
-from fastapi.param_functions import Query
-from fastapi.params import Depends
-from starlette.exceptions import HTTPException
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnbits.extensions.nostr import nostr_ext
-from lnbits.utils.exchange_rates import currencies
-
-from . import nostr_ext
-from .crud import (
-    create_nostrkeys,
-    get_nostrkeys,
-    create_nostrnotes,
-    get_nostrnotes,
-    create_nostrrelays,
-    get_nostrrelays,
-    create_nostrconnections,
-    get_nostrconnections,
-)
-from .models import nostrKeys
\ No newline at end of file
diff --git a/lnbits/extensions/nostr/README.md b/lnbits/extensions/nostradmin/README.md
similarity index 100%
rename from lnbits/extensions/nostr/README.md
rename to lnbits/extensions/nostradmin/README.md
diff --git a/lnbits/extensions/nostr/__init__.py b/lnbits/extensions/nostradmin/__init__.py
similarity index 51%
rename from lnbits/extensions/nostr/__init__.py
rename to lnbits/extensions/nostradmin/__init__.py
index 9774a279..7034ca46 100644
--- a/lnbits/extensions/nostr/__init__.py
+++ b/lnbits/extensions/nostradmin/__init__.py
@@ -3,13 +3,14 @@ from fastapi import APIRouter
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
 
-db = Database("ext_nostr")
+db = Database("ext_nostradmin")
 
-nostr_ext: APIRouter = APIRouter(prefix="/nostr", tags=["nostr"])
+nostr_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
 
 
 def nostr_renderer():
-    return template_renderer(["lnbits/extensions/nostr/templates"])
+    return template_renderer(["lnbits/extensions/nostradmin/templates"])
+
 
 from .views import *  # noqa
 from .views_api import *  # noqa
diff --git a/lnbits/extensions/nostradmin/config.json b/lnbits/extensions/nostradmin/config.json
new file mode 100644
index 00000000..2c4f76d3
--- /dev/null
+++ b/lnbits/extensions/nostradmin/config.json
@@ -0,0 +1,6 @@
+{
+  "name": "NostrAdmin",
+  "short_description": "Admin daemon for Nostr",
+  "icon": "swap_horizontal_circle",
+  "contributors": ["arcbtc"]
+}
diff --git a/lnbits/extensions/nostradmin/crud.py b/lnbits/extensions/nostradmin/crud.py
new file mode 100644
index 00000000..08908e85
--- /dev/null
+++ b/lnbits/extensions/nostradmin/crud.py
@@ -0,0 +1,156 @@
+from typing import List, Optional, Union
+
+from lnbits.helpers import urlsafe_short_hash
+import shortuuid
+from . import db
+from .models import (
+    nostrKeys,
+    nostrNotes,
+    nostrCreateRelays,
+    nostrRelays,
+    nostrConnections,
+    nostrCreateConnections,
+    nostrRelayList,
+)
+
+###############KEYS##################
+
+
+async def create_nostrkeys(data: nostrKeys) -> nostrKeys:
+    await db.execute(
+        """
+        INSERT INTO nostradmin.keys (
+            pubkey,
+            privkey
+        )
+        VALUES (?, ?)
+        """,
+        (data.pubkey, data.privkey),
+    )
+    return await get_nostrkeys(nostrkey_id)
+
+
+async def get_nostrkeys(pubkey: str) -> nostrKeys:
+    row = await db.fetchone("SELECT * FROM nostradmin.keys WHERE pubkey = ?", (pubkey,))
+    return nostrKeys(**row) if row else None
+
+
+###############NOTES##################
+
+
+async def create_nostrnotes(data: nostrNotes) -> nostrNotes:
+    await db.execute(
+        """
+        INSERT INTO nostradmin.notes (
+            id,
+            pubkey,
+            created_at,
+            kind,
+            tags,
+            content,
+            sig
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+        """,
+        (
+            data.id,
+            data.pubkey,
+            data.created_at,
+            data.kind,
+            data.tags,
+            data.content,
+            data.sig,
+        ),
+    )
+    return await get_nostrnotes(data.id)
+
+
+async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
+    row = await db.fetchone("SELECT * FROM nostradmin.notes WHERE id = ?", (nostrnote_id,))
+    return nostrNotes(**row) if row else None
+
+
+###############RELAYS##################
+
+
+async def create_nostrrelays(data: nostrCreateRelays) -> nostrCreateRelays:
+    nostrrelay_id = shortuuid.uuid(name=data.relay)
+
+    if await get_nostrrelay(nostrrelay_id):
+        return "error"
+    await db.execute(
+        """
+        INSERT INTO nostradmin.relays (
+            id,
+            relay
+        )
+        VALUES (?, ?)
+        """,
+        (nostrrelay_id, data.relay),
+    )
+    return await get_nostrrelay(nostrrelay_id)
+
+
+async def get_nostrrelays() -> nostrRelays:
+    rows = await db.fetchall("SELECT * FROM nostradmin.relays")
+    return [nostrRelays(**row) for row in rows]
+
+
+async def get_nostrrelay(nostrrelay_id: str) -> nostrRelays:
+    row = await db.fetchone("SELECT * FROM nostradmin.relays WHERE id = ?", (nostrrelay_id,))
+    return nostrRelays(**row) if row else None
+
+
+async def update_nostrrelayallowlist(allowlist: str) -> nostrRelayList:
+    await db.execute(
+        """
+        UPDATE nostradmin.relaylist SET
+          allowlist = ?
+        WHERE id = ?
+        """,
+        (allowlist, 1),
+    )
+    return await get_nostrrelaylist()
+
+async def update_nostrrelaydenylist(denylist: str) -> nostrRelayList:
+    await db.execute(
+        """
+        UPDATE nostradmin.relaylist SET
+          denylist = ?
+        WHERE id = ?
+        """,
+        (denylist, 1),
+    )
+    return await get_nostrrelaylist()
+
+async def get_nostrrelaylist() -> nostrRelayList:
+    row = await db.fetchone("SELECT * FROM nostradmin.relaylist WHERE id = ?", (1,))
+    return nostrRelayList(**row) if row else None
+
+
+###############CONNECTIONS##################
+
+
+async def create_nostrconnections(
+    data: nostrCreateConnections
+) -> nostrCreateConnections:
+    nostrrelay_id = shortuuid.uuid(name=data.relayid + data.pubkey)
+    await db.execute(
+        """
+        INSERT INTO nostradmin.connections (
+            id,
+            pubkey,
+            relayid
+        )
+        VALUES (?, ?, ?)
+        """,
+        (data.id, data.pubkey, data.relayid),
+    )
+    return await get_nostrconnections(data.id)
+
+
+async def get_nostrconnections(nostrconnections_id: str) -> nostrConnections:
+    row = await db.fetchone(
+        "SELECT * FROM nostradmin.connections WHERE id = ?", (nostrconnections_id,)
+    )
+    return nostrConnections(**row) if row else None
diff --git a/lnbits/extensions/nostr/migrations.py b/lnbits/extensions/nostradmin/migrations.py
similarity index 54%
rename from lnbits/extensions/nostr/migrations.py
rename to lnbits/extensions/nostradmin/migrations.py
index 0c616110..09b28117 100644
--- a/lnbits/extensions/nostr/migrations.py
+++ b/lnbits/extensions/nostradmin/migrations.py
@@ -9,7 +9,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE nostr.keys (
+        CREATE TABLE nostradmin.keys (
             pubkey TEXT NOT NULL PRIMARY KEY,
             privkey TEXT NOT NULL
         );
@@ -17,7 +17,7 @@ async def m001_initial(db):
     )
     await db.execute(
         f"""
-        CREATE TABLE nostr.notes (
+        CREATE TABLE nostradmin.notes (
             id TEXT NOT NULL PRIMARY KEY,
             pubkey TEXT NOT NULL,
             created_at TEXT NOT NULL,
@@ -30,7 +30,7 @@ async def m001_initial(db):
     )
     await db.execute(
         f"""
-        CREATE TABLE nostr.relays (
+        CREATE TABLE nostradmin.relays (
             id TEXT NOT NULL PRIMARY KEY,
             relay TEXT NOT NULL
         );
@@ -38,10 +38,32 @@ async def m001_initial(db):
     )
     await db.execute(
         f"""
-        CREATE TABLE nostr.connections (
+        CREATE TABLE nostradmin.relaylists (
+            id TEXT NOT NULL PRIMARY KEY DEFAULT 1,
+            allowlist TEXT NOT NULL,
+            denylist TEXT NOT NULL
+        );
+    """
+    )
+    try:
+        await db.execute(
+            """
+            INSERT INTO nostradmin.relaylist (
+                id,
+                denylist
+            )
+            VALUES (?, ?,)
+            """,
+            (1, "\n".join(["wss://zucks-meta-relay.com", "wss://nostradmin.cia.gov"])),
+        )
+    except:
+        return
+    await db.execute(
+        f"""
+        CREATE TABLE nostradmin.connections (
             id TEXT NOT NULL PRIMARY KEY,
             publickey TEXT NOT NULL,
             relayid TEXT NOT NULL
         );
     """
-    )
\ No newline at end of file
+    )
diff --git a/lnbits/extensions/nostr/models.py b/lnbits/extensions/nostradmin/models.py
similarity index 73%
rename from lnbits/extensions/nostr/models.py
rename to lnbits/extensions/nostradmin/models.py
index e21e5d76..fd89f515 100644
--- a/lnbits/extensions/nostr/models.py
+++ b/lnbits/extensions/nostradmin/models.py
@@ -6,6 +6,7 @@ from fastapi import Request
 from pydantic import BaseModel
 from pydantic.main import BaseModel
 
+
 class nostrKeys(BaseModel):
     pubkey: str
     privkey: str
@@ -30,7 +31,18 @@ class nostrRelays(BaseModel):
     id: str
     relay: str
 
+class nostrRelayList(BaseModel):
+    id: str
+    allowlist: str
+    denylist: str
+
+class nostrRelayDenyList(BaseModel):
+    denylist: str
+
+class nostrRelayAllowList(BaseModel):
+    allowlist: str
+
 class nostrConnections(BaseModel):
     id: str
     pubkey: str
-    relayid: str
\ No newline at end of file
+    relayid: str
diff --git a/lnbits/extensions/nostr/templates/nostr/index.html b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
similarity index 50%
rename from lnbits/extensions/nostr/templates/nostr/index.html
rename to lnbits/extensions/nostradmin/templates/nostradmin/index.html
index f17d0243..adab98e2 100644
--- a/lnbits/extensions/nostr/templates/nostr/index.html
+++ b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
@@ -71,12 +71,77 @@
         </q-table>
       </q-card-section>
     </q-card>
+    <q-card>
+      <q-tabs
+        v-model="listSelection"
+        dense
+        class="text-grey"
+        active-color="primary"
+        indicator-color="primary"
+        align="justify"
+        narrow-indicator
+      >
+        <q-tab name="denylist" label="Deny List" />
+        <q-tab name="allowlist" label="Allow List" />
+      </q-tabs>
+
+      <q-separator />
+
+      <q-tab-panels v-model="tab" animated>
+        <q-tab-panel name="denylist">
+          <div class="text-h6">
+            Deny List (denys use of relays in this list)
+          </div>
+          <q-form class="q-gutter-md q-y-md" @submit="setDenyList">
+            <div class="row">
+              <div class="col q-mx-lg">
+                <q-input v-model="denyList" dense filled autogrow />
+              </div>
+              <div
+                class="col q-mx-lg items-align flex items-center justify-center"
+              >
+                <q-btn unelevated color="primary" type="submit">
+                  Update Deny List
+                </q-btn>
+                <q-btn @click="loadShop" flat color="grey" class="q-ml-auto"
+                  >Reset</q-btn
+                >
+              </div>
+            </div>
+          </q-form>
+        </q-tab-panel>
+
+        <q-tab-panel name="allowlist">
+          <div class="text-h6">
+            Allow List (denys any relays not in this list)
+          </div>
+          <q-form class="q-gutter-md q-y-md" @submit="setAllowList">
+            <div class="row">
+              <div class="col q-mx-lg">
+                <q-input v-model="allowList" dense filled autogrow />
+              </div>
+              <div
+                class="col q-mx-lg items-align flex items-center justify-center"
+              >
+                <q-btn unelevated color="primary" type="submit">
+                  Update Allow List
+                </q-btn>
+                <q-btn @click="loadShop" flat color="grey" class="q-ml-auto"
+                  >Reset</q-btn
+                >
+              </div>
+            </div>
+          </q-form>
+        </q-tab-panel>
+      </q-tab-panels>
+    </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">{{SITE_TITLE}} Nostr Extension</h6>
+        <p>Only Admin users can manage this extension</p>
 
         <q-card-section>Okay </q-card-section>
       </q-card-section>
@@ -109,6 +174,9 @@
     mixins: [windowMixin],
     data: function () {
       return {
+        listSelection: 'denylist',
+        allowList: [],
+        denyList: [],
         nostrTable: {
           columns: [
             {
@@ -136,12 +204,66 @@
         LNbits.api
           .request(
             'GET',
-            '/nostr/api/v1/relays',
+            '/nostradmin/api/v1/relays',
             self.g.user.wallets[0].adminkey
           )
           .then(function (response) {
             if (response.data) {
-              self.lnurldeviceLinks = response.data.map(maplnurldevice)
+              self.nostrrelayLinks = response.data.map(maprelays)
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      setAllowList: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'POST',
+            '/nostradmin/api/v1/allowlist',
+            self.g.user.wallets[0].adminkey,
+            self.allowList
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.allowList = response.data
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      setDenyList: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'POST',
+            '/nostradmin/api/v1/denylist',
+            self.g.user.wallets[0].adminkey,
+            self.allowList
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.denyList = response.data
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getLists: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/nostradmin/api/v1/relaylist',
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.denyList = response.data.denylist
+              self.allowList = response.data.allowlist
             }
           })
           .catch(function (error) {
@@ -151,8 +273,8 @@
     },
     created: function () {
       var self = this
-      var getrelays = this.getrelays
-      getrelays()
+      this.getrelays()
+      this.getLists()
     }
   })
 </script>
diff --git a/lnbits/extensions/nostr/views.py b/lnbits/extensions/nostradmin/views.py
similarity index 90%
rename from lnbits/extensions/nostr/views.py
rename to lnbits/extensions/nostradmin/views.py
index 1dfc07da..5609c218 100644
--- a/lnbits/extensions/nostr/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -20,5 +20,5 @@ templates = Jinja2Templates(directory="templates")
 @nostr_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return nostr_renderer().TemplateResponse(
-        "nostr/index.html", {"request": request, "user": user.dict()}
+        "nostradmin/index.html", {"request": request, "user": user.dict()}
     )
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
new file mode 100644
index 00000000..da6e140b
--- /dev/null
+++ b/lnbits/extensions/nostradmin/views_api.py
@@ -0,0 +1,87 @@
+from http import HTTPStatus
+import asyncio
+from fastapi import Request
+from fastapi.param_functions import Query
+from fastapi.params import Depends
+from starlette.exceptions import HTTPException
+
+from lnbits.core.crud import get_user
+from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
+from lnbits.extensions.nostr import nostr_ext
+from lnbits.utils.exchange_rates import currencies
+
+from . import nostr_ext
+from lnbits.settings import LNBITS_ADMIN_USERS
+from .crud import (
+    create_nostrkeys,
+    get_nostrkeys,
+    create_nostrnotes,
+    get_nostrnotes,
+    create_nostrrelays,
+    get_nostrrelays,
+    get_nostrrelaylist,
+    update_nostrrelayallowlist,
+    update_nostrrelaydenylist,
+    create_nostrconnections,
+    get_nostrconnections,
+)
+from .models import nostrKeys, nostrCreateRelays, nostrRelayAllowList, nostrRelayDenyList
+
+
+# while True:
+async def nostr_subscribe():
+    return
+    # for the relays:
+    # async with websockets.connect("ws://localhost:8765") as websocket:
+    # for the public keys:
+    # await websocket.send("subscribe to events")
+    # await websocket.recv()
+
+
+websocket_queue = asyncio.Queue(1000)
+
+
+async def internal_invoice_listener():
+    while True:
+        checking_id = await internal_invoice_queue.get()
+        asyncio.create_task(invoice_callback_dispatcher(checking_id))
+
+
+@nostr_ext.get("/api/v1/relays")
+async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
+
+    relays = await get_nostrrelays()
+    if not relays:
+        await create_nostrrelays(nostrCreateRelays(relay="wss://relayer.fiatjaf.com"))
+        await create_nostrrelays(
+            nostrCreateRelays(relay="wss://nostr-pub.wellorder.net")
+        )
+        relays = await get_nostrrelays()
+    try:
+        return [{**relays.dict()} for relays in await relays]
+    except:
+        None
+
+@nostr_ext.get("/api/v1/relaylist")
+async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):
+    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+    return await get_nostrrelaylist()
+
+@nostr_ext.post("/api/v1/allowlist")
+async def api_relaysallowed(data: nostrRelayAllowList, wallet: WalletTypeInfo = Depends(get_key_type)):
+    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+    return await update_nostrrelayallowlist(data)
+
+@nostr_ext.post("/api/v1/denylist")
+async def api_relaysdenyed(data: nostrRelayDenyList, wallet: WalletTypeInfo = Depends(get_key_type)):
+    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+    return await update_nostrrelaydenylist(data)
\ No newline at end of file

From 2c435ee9d906b214fbcc6b19541898dcab01d4a4 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Tue, 8 Feb 2022 13:13:36 +0000
Subject: [PATCH 044/174] models decided

---
 lnbits/extensions/nostradmin/__init__.py      |  2 +-
 lnbits/extensions/nostradmin/crud.py          | 22 ++----
 lnbits/extensions/nostradmin/migrations.py    | 41 ++++++-----
 lnbits/extensions/nostradmin/models.py        | 33 +++++----
 .../templates/nostradmin/index.html           | 71 +++++++++++--------
 lnbits/extensions/nostradmin/views.py         |  5 +-
 lnbits/extensions/nostradmin/views_api.py     | 33 +++------
 7 files changed, 100 insertions(+), 107 deletions(-)

diff --git a/lnbits/extensions/nostradmin/__init__.py b/lnbits/extensions/nostradmin/__init__.py
index 7034ca46..797542c4 100644
--- a/lnbits/extensions/nostradmin/__init__.py
+++ b/lnbits/extensions/nostradmin/__init__.py
@@ -5,7 +5,7 @@ from lnbits.helpers import template_renderer
 
 db = Database("ext_nostradmin")
 
-nostr_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
+nostradmin_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
 
 
 def nostr_renderer():
diff --git a/lnbits/extensions/nostradmin/crud.py b/lnbits/extensions/nostradmin/crud.py
index 08908e85..1e1bf810 100644
--- a/lnbits/extensions/nostradmin/crud.py
+++ b/lnbits/extensions/nostradmin/crud.py
@@ -12,6 +12,7 @@ from .models import (
     nostrCreateConnections,
     nostrRelayList,
 )
+from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
 
 ###############KEYS##################
 
@@ -100,31 +101,20 @@ async def get_nostrrelay(nostrrelay_id: str) -> nostrRelays:
     row = await db.fetchone("SELECT * FROM nostradmin.relays WHERE id = ?", (nostrrelay_id,))
     return nostrRelays(**row) if row else None
 
-
-async def update_nostrrelayallowlist(allowlist: str) -> nostrRelayList:
+async def update_nostrrelaysetlist(data: nostrRelaySetList) -> nostrRelayList:
     await db.execute(
         """
-        UPDATE nostradmin.relaylist SET
+        UPDATE nostradmin.relaylists SET
+          denylist = ?,
           allowlist = ?
         WHERE id = ?
         """,
-        (allowlist, 1),
-    )
-    return await get_nostrrelaylist()
-
-async def update_nostrrelaydenylist(denylist: str) -> nostrRelayList:
-    await db.execute(
-        """
-        UPDATE nostradmin.relaylist SET
-          denylist = ?
-        WHERE id = ?
-        """,
-        (denylist, 1),
+        (data.denylist, data.allowlist, 1),
     )
     return await get_nostrrelaylist()
 
 async def get_nostrrelaylist() -> nostrRelayList:
-    row = await db.fetchone("SELECT * FROM nostradmin.relaylist WHERE id = ?", (1,))
+    row = await db.fetchone("SELECT * FROM nostradmin.relaylists WHERE id = ?", (1,))
     return nostrRelayList(**row) if row else None
 
 
diff --git a/lnbits/extensions/nostradmin/migrations.py b/lnbits/extensions/nostradmin/migrations.py
index 09b28117..590f72ea 100644
--- a/lnbits/extensions/nostradmin/migrations.py
+++ b/lnbits/extensions/nostradmin/migrations.py
@@ -1,11 +1,8 @@
 from lnbits.db import Database
 
-db2 = Database("ext_nostr")
-
-
 async def m001_initial(db):
     """
-    Initial nostr table.
+    Initial nostradmin table.
     """
     await db.execute(
         f"""
@@ -40,24 +37,23 @@ async def m001_initial(db):
         f"""
         CREATE TABLE nostradmin.relaylists (
             id TEXT NOT NULL PRIMARY KEY DEFAULT 1,
-            allowlist TEXT NOT NULL,
-            denylist TEXT NOT NULL
+            allowlist TEXT,
+            denylist TEXT
         );
     """
     )
-    try:
-        await db.execute(
-            """
-            INSERT INTO nostradmin.relaylist (
-                id,
-                denylist
-            )
-            VALUES (?, ?,)
-            """,
-            (1, "\n".join(["wss://zucks-meta-relay.com", "wss://nostradmin.cia.gov"])),
+
+    await db.execute(
+        """
+        INSERT INTO nostradmin.relaylists (
+            id,
+            denylist
         )
-    except:
-        return
+        VALUES (?, ?)
+        """,
+        ("1", "wss://zucks-meta-relay.com\nwss://nostr.cia.gov",),
+    )
+
     await db.execute(
         f"""
         CREATE TABLE nostradmin.connections (
@@ -67,3 +63,12 @@ async def m001_initial(db):
         );
     """
     )
+    await db.execute(
+        f"""
+        CREATE TABLE nostradmin.subscribed (
+            id TEXT NOT NULL PRIMARY KEY,
+            userPubkey TEXT NOT NULL,
+            subscribedPubkey TEXT NOT NULL
+        );
+    """
+    )
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/models.py b/lnbits/extensions/nostradmin/models.py
index fd89f515..1968567f 100644
--- a/lnbits/extensions/nostradmin/models.py
+++ b/lnbits/extensions/nostradmin/models.py
@@ -5,7 +5,7 @@ from typing import Optional
 from fastapi import Request
 from pydantic import BaseModel
 from pydantic.main import BaseModel
-
+from fastapi.param_functions import Query
 
 class nostrKeys(BaseModel):
     pubkey: str
@@ -21,28 +21,31 @@ class nostrNotes(BaseModel):
     sig: str
 
 class nostrCreateRelays(BaseModel):
-    relay: str
+    relay: str = Query(None)
 
 class nostrCreateConnections(BaseModel):
-    pubkey: str
-    relayid: str
+    pubkey: str = Query(None)
+    relayid: str = Query(None)
 
 class nostrRelays(BaseModel):
-    id: str
-    relay: str
+    id: Optional[str]
+    relay: Optional[str]
 
 class nostrRelayList(BaseModel):
     id: str
-    allowlist: str
-    denylist: str
+    allowlist: Optional[str]
+    denylist: Optional[str]
 
-class nostrRelayDenyList(BaseModel):
-    denylist: str
-
-class nostrRelayAllowList(BaseModel):
-    allowlist: str
+class nostrRelaySetList(BaseModel):
+    allowlist: Optional[str]
+    denylist: Optional[str] 
 
 class nostrConnections(BaseModel):
     id: str
-    pubkey: str
-    relayid: str
+    pubkey: Optional[str]
+    relayid: Optional[str]
+
+class nostrSubscriptions(BaseModel):
+    id: str
+    userPubkey: Optional[str]
+    subscribedPubkey: Optional[str]
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/templates/nostradmin/index.html b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
index adab98e2..27decdc8 100644
--- a/lnbits/extensions/nostradmin/templates/nostradmin/index.html
+++ b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
@@ -6,7 +6,7 @@
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Nostr</h5>
+            <h5 class="text-subtitle1 q-my-none">NOSTR RELAYS ONLINE</h5>
           </div>
 
           <div class="col-auto">
@@ -29,7 +29,7 @@
         <q-table
           flat
           dense
-          :data="lnurldeviceLinks"
+          :data="nostrLinks"
           row-key="id"
           :columns="nostrTable.columns"
           :pagination.sync="nostrTable.pagination"
@@ -81,21 +81,24 @@
         align="justify"
         narrow-indicator
       >
-        <q-tab name="denylist" label="Deny List" />
-        <q-tab name="allowlist" label="Allow List" />
+        <q-tab name="denylist" label="Deny List"></q-tab>
+        <q-tab name="allowlist" label="Allow List"></q-tab>
       </q-tabs>
 
-      <q-separator />
+      <q-separator></q-separator>
 
-      <q-tab-panels v-model="tab" animated>
+      <q-tab-panels v-model="listSelection" animated>
         <q-tab-panel name="denylist">
-          <div class="text-h6">
-            Deny List (denys use of relays in this list)
-          </div>
-          <q-form class="q-gutter-md q-y-md" @submit="setDenyList">
+          <div class="text-h6">Relays in this list will NOT be used</div>
+          <q-form class="q-gutter-md q-y-md" @submit="setRelayList">
             <div class="row">
               <div class="col q-mx-lg">
-                <q-input v-model="denyList" dense filled autogrow />
+                <q-input
+                  v-model="setList.denylist"
+                  dense
+                  filled
+                  autogrow
+                ></q-input>
               </div>
               <div
                 class="col q-mx-lg items-align flex items-center justify-center"
@@ -103,22 +106,22 @@
                 <q-btn unelevated color="primary" type="submit">
                   Update Deny List
                 </q-btn>
-                <q-btn @click="loadShop" flat color="grey" class="q-ml-auto"
-                  >Reset</q-btn
-                >
               </div>
             </div>
           </q-form>
         </q-tab-panel>
 
         <q-tab-panel name="allowlist">
-          <div class="text-h6">
-            Allow List (denys any relays not in this list)
-          </div>
-          <q-form class="q-gutter-md q-y-md" @submit="setAllowList">
+          <div class="text-h6">ONLY relays in this list will be used</div>
+          <q-form class="q-gutter-md q-y-md" @submit="setRelayList">
             <div class="row">
               <div class="col q-mx-lg">
-                <q-input v-model="allowList" dense filled autogrow />
+                <q-input
+                  v-model="setList.allowlist"
+                  dense
+                  filled
+                  autogrow
+                ></q-input>
               </div>
               <div
                 class="col q-mx-lg items-align flex items-center justify-center"
@@ -126,9 +129,6 @@
                 <q-btn unelevated color="primary" type="submit">
                   Update Allow List
                 </q-btn>
-                <q-btn @click="loadShop" flat color="grey" class="q-ml-auto"
-                  >Reset</q-btn
-                >
               </div>
             </div>
           </q-form>
@@ -175,8 +175,12 @@
     data: function () {
       return {
         listSelection: 'denylist',
-        allowList: [],
-        denyList: [],
+        setList: {
+          allowlist: '',
+          denylist: ''
+        },
+        nostrLinks: [],
+        filter: '',
         nostrTable: {
           columns: [
             {
@@ -234,18 +238,20 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      setDenyList: function () {
+      setRelayList: function () {
         var self = this
+        console.log(self.setList)
         LNbits.api
           .request(
             'POST',
-            '/nostradmin/api/v1/denylist',
+            '/nostradmin/api/v1/setlist',
             self.g.user.wallets[0].adminkey,
-            self.allowList
+            self.setList
           )
           .then(function (response) {
             if (response.data) {
-              self.denyList = response.data
+              console.log(response.data)
+              // self.denyList = response.data
             }
           })
           .catch(function (error) {
@@ -262,13 +268,18 @@
           )
           .then(function (response) {
             if (response.data) {
-              self.denyList = response.data.denylist
-              self.allowList = response.data.allowlist
+              console.log(response.data)
+              self.setList.denylist = response.data.denylist
+              self.setList.allowlist = response.data.allowlist
             }
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
+      },
+      exportlnurldeviceCSV: function () {
+        var self = this
+        LNbits.utils.exportCSV(self.nostrTable.columns, this.nostrLinks)
       }
     },
     created: function () {
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 5609c218..51297320 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -6,18 +6,19 @@ from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
+from . import nostradmin_ext, nostr_renderer
 
 from lnbits.core.crud import update_payment_status
 from lnbits.core.models import User
 from lnbits.core.views.api import api_payment
 from lnbits.decorators import check_user_exists
 
-from . import nostr_ext, nostr_renderer
+
 
 templates = Jinja2Templates(directory="templates")
 
 
-@nostr_ext.get("/", response_class=HTMLResponse)
+@nostradmin_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return nostr_renderer().TemplateResponse(
         "nostradmin/index.html", {"request": request, "user": user.dict()}
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
index da6e140b..d79315ac 100644
--- a/lnbits/extensions/nostradmin/views_api.py
+++ b/lnbits/extensions/nostradmin/views_api.py
@@ -7,11 +7,10 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnbits.extensions.nostr import nostr_ext
 from lnbits.utils.exchange_rates import currencies
 
-from . import nostr_ext
 from lnbits.settings import LNBITS_ADMIN_USERS
+from . import nostradmin_ext
 from .crud import (
     create_nostrkeys,
     get_nostrkeys,
@@ -20,13 +19,11 @@ from .crud import (
     create_nostrrelays,
     get_nostrrelays,
     get_nostrrelaylist,
-    update_nostrrelayallowlist,
-    update_nostrrelaydenylist,
+    update_nostrrelaysetlist,
     create_nostrconnections,
     get_nostrconnections,
 )
-from .models import nostrKeys, nostrCreateRelays, nostrRelayAllowList, nostrRelayDenyList
-
+from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
 
 # while True:
 async def nostr_subscribe():
@@ -41,13 +38,7 @@ async def nostr_subscribe():
 websocket_queue = asyncio.Queue(1000)
 
 
-async def internal_invoice_listener():
-    while True:
-        checking_id = await internal_invoice_queue.get()
-        asyncio.create_task(invoice_callback_dispatcher(checking_id))
-
-
-@nostr_ext.get("/api/v1/relays")
+@nostradmin_ext.get("/api/v1/relays")
 async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
 
     relays = await get_nostrrelays()
@@ -62,7 +53,7 @@ async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
     except:
         None
 
-@nostr_ext.get("/api/v1/relaylist")
+@nostradmin_ext.get("/api/v1/relaylist")
 async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):
     if wallet.wallet.user not in LNBITS_ADMIN_USERS:
         raise HTTPException(
@@ -70,18 +61,10 @@ async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):
         )
     return await get_nostrrelaylist()
 
-@nostr_ext.post("/api/v1/allowlist")
-async def api_relaysallowed(data: nostrRelayAllowList, wallet: WalletTypeInfo = Depends(get_key_type)):
+@nostradmin_ext.post("/api/v1/setlist")
+async def api_relayssetlist(data: nostrRelaySetList, wallet: WalletTypeInfo = Depends(get_key_type)):
     if wallet.wallet.user not in LNBITS_ADMIN_USERS:
         raise HTTPException(
             status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
         )
-    return await update_nostrrelayallowlist(data)
-
-@nostr_ext.post("/api/v1/denylist")
-async def api_relaysdenyed(data: nostrRelayDenyList, wallet: WalletTypeInfo = Depends(get_key_type)):
-    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
-        )
-    return await update_nostrrelaydenylist(data)
\ No newline at end of file
+    return await update_nostrrelaysetlist(data)
\ No newline at end of file

From 3f356f9de8d48995db0e301aa27015b2827fa70e Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Tue, 8 Feb 2022 13:52:19 +0000
Subject: [PATCH 045/174] Started planning websocket daemon

---
 lnbits/extensions/nostradmin/views.py     | 70 ++++++++++++++++++++++-
 lnbits/extensions/nostradmin/views_api.py | 12 ----
 2 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 51297320..235ec7e9 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -1,5 +1,6 @@
 from http import HTTPStatus
-
+import asyncio
+import asyncio
 from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
@@ -7,13 +8,14 @@ from fastapi.templating import Jinja2Templates
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
 from . import nostradmin_ext, nostr_renderer
+from fastapi import Request, WebSocket, WebSocketDisconnect
 
 from lnbits.core.crud import update_payment_status
 from lnbits.core.models import User
 from lnbits.core.views.api import api_payment
 from lnbits.decorators import check_user_exists
 
-
+from .crud import get_nostrkeys
 
 templates = Jinja2Templates(directory="templates")
 
@@ -23,3 +25,67 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
     return nostr_renderer().TemplateResponse(
         "nostradmin/index.html", {"request": request, "user": user.dict()}
     )
+
+#####################################################################
+#################### NOSTR WEBSOCKET THREAD #########################
+##### THE QUEUE LOOP THREAD THING THAT LISTENS TO BUNCH OF ##########
+### WEBSOCKET CONNECTIONS, STORING DATA IN DB/PUSHING TO FRONTEND ###
+################### VIA updater() FUNCTION ##########################
+#####################################################################
+
+websocket_queue = asyncio.Queue(1000)
+
+# while True:
+async def nostr_subscribe():
+    return
+    # for the relays:
+    # async with websockets.connect("ws://localhost:8765") as websocket:
+    # for the public keys:
+    # await websocket.send("subscribe to events")
+    # await websocket.recv()
+
+#####################################################################
+################### LNBITS WEBSOCKET ROUTES #########################
+#### HERE IS WHERE LNBITS FRONTEND CAN RECEIVE AND SEND MESSAGES ####
+#####################################################################
+
+class ConnectionManager:
+    def __init__(self):
+        self.active_connections: List[WebSocket] = []
+
+    async def connect(self, websocket: WebSocket, nostr_id: str):
+        await websocket.accept()
+        websocket.id = nostr_id
+        self.active_connections.append(websocket)
+
+    def disconnect(self, websocket: WebSocket):
+        self.active_connections.remove(websocket)
+
+    async def send_personal_message(self, message: str, nostr_id: str):
+        for connection in self.active_connections:
+            if connection.id == nostr_id:
+                await connection.send_text(message)
+
+    async def broadcast(self, message: str):
+        for connection in self.active_connections:
+            await connection.send_text(message)
+
+
+manager = ConnectionManager()
+
+
+@nostradmin_ext.websocket("/nostradmin/ws/{nostr_id}", name="copilot.websocket_by_id")
+async def websocket_endpoint(websocket: WebSocket, copilot_id: str):
+    await manager.connect(websocket, nostr_id)
+    try:
+        while True:
+            data = await websocket.receive_text()
+    except WebSocketDisconnect:
+        manager.disconnect(websocket)
+
+
+async def updater(nostr_id, message):
+    copilot = await get_copilot(nostr_id)
+    if not copilot:
+        return
+    await manager.send_personal_message(f"{message}", nostr_id)
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
index d79315ac..ad8bcf17 100644
--- a/lnbits/extensions/nostradmin/views_api.py
+++ b/lnbits/extensions/nostradmin/views_api.py
@@ -25,18 +25,6 @@ from .crud import (
 )
 from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
 
-# while True:
-async def nostr_subscribe():
-    return
-    # for the relays:
-    # async with websockets.connect("ws://localhost:8765") as websocket:
-    # for the public keys:
-    # await websocket.send("subscribe to events")
-    # await websocket.recv()
-
-
-websocket_queue = asyncio.Queue(1000)
-
 
 @nostradmin_ext.get("/api/v1/relays")
 async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):

From 4e65c39b362921b81488f9a1212cb57714b879fe Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Tue, 8 Feb 2022 14:02:50 +0000
Subject: [PATCH 046/174] typo

---
 lnbits/extensions/nostradmin/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 235ec7e9..f00c43a3 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -74,7 +74,7 @@ class ConnectionManager:
 manager = ConnectionManager()
 
 
-@nostradmin_ext.websocket("/nostradmin/ws/{nostr_id}", name="copilot.websocket_by_id")
+@nostradmin_ext.websocket("/nostradmin/ws/{nostr_id}", name="nostr_id.websocket_by_id")
 async def websocket_endpoint(websocket: WebSocket, copilot_id: str):
     await manager.connect(websocket, nostr_id)
     try:

From dbc47332ee71508ea39861ef2d8cef9cf3236b25 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 10 Feb 2022 09:58:50 +0000
Subject: [PATCH 047/174] Working, looking good

---
 lnbits/extensions/nostradmin/models.py        |  1 +
 .../templates/nostradmin/index.html           | 39 ++++++++++++-------
 lnbits/extensions/nostradmin/views.py         | 21 +++++++---
 lnbits/extensions/nostradmin/views_api.py     | 17 +++++---
 4 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/lnbits/extensions/nostradmin/models.py b/lnbits/extensions/nostradmin/models.py
index 1968567f..dc99b083 100644
--- a/lnbits/extensions/nostradmin/models.py
+++ b/lnbits/extensions/nostradmin/models.py
@@ -30,6 +30,7 @@ class nostrCreateConnections(BaseModel):
 class nostrRelays(BaseModel):
     id: Optional[str]
     relay: Optional[str]
+    status: Optional[bool] = False
 
 class nostrRelayList(BaseModel):
     id: str
diff --git a/lnbits/extensions/nostradmin/templates/nostradmin/index.html b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
index 27decdc8..57552bf2 100644
--- a/lnbits/extensions/nostradmin/templates/nostradmin/index.html
+++ b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
@@ -29,7 +29,7 @@
         <q-table
           flat
           dense
-          :data="nostrLinks"
+          :data="nostrrelayLinks"
           row-key="id"
           :columns="nostrTable.columns"
           :pagination.sync="nostrTable.pagination"
@@ -38,9 +38,6 @@
           {% raw %}
           <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
                 v-for="col in props.cols"
                 :key="col.name"
@@ -63,7 +60,12 @@
                 auto-width
               >
                 <div v-if="col.name == 'id'"></div>
-                <div v-else>{{ col.value }}</div>
+                <div v-else>
+                  <div v-if="col.value == true" style="background-color: green">
+                    {{ col.value }}
+                  </div>
+                  <div v-else>{{ col.value }}</div>
+                </div>
               </q-td>
             </q-tr>
           </template>
@@ -143,7 +145,7 @@
         <h6 class="text-subtitle1 q-my-none">{{SITE_TITLE}} Nostr Extension</h6>
         <p>Only Admin users can manage this extension</p>
 
-        <q-card-section>Okay </q-card-section>
+        <q-card-section></q-card-section>
       </q-card-section>
     </q-card>
   </div>
@@ -153,7 +155,7 @@
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
 
-  var maplnurldevice = obj => {
+  var maplrelays = obj => {
     obj._data = _.clone(obj)
     obj.theTime = obj.time * 60 - (Date.now() / 1000 - obj.timestamp)
     obj.time = obj.time + 'mins'
@@ -179,10 +181,16 @@
           allowlist: '',
           denylist: ''
         },
-        nostrLinks: [],
+        nostrrelayLinks: [],
         filter: '',
         nostrTable: {
           columns: [
+            {
+              name: 'wah',
+              align: 'left',
+              label: 'id',
+              field: 'id'
+            },
             {
               name: 'relay',
               align: 'left',
@@ -190,10 +198,10 @@
               field: 'relay'
             },
             {
-              name: 'connected',
+              name: 'status',
               align: 'left',
-              label: 'connected',
-              field: 'connected'
+              label: 'status',
+              field: 'status'
             }
           ],
           pagination: {
@@ -203,7 +211,7 @@
       }
     },
     methods: {
-      getrelays: function () {
+      getRelays: function () {
         var self = this
         LNbits.api
           .request(
@@ -213,7 +221,10 @@
           )
           .then(function (response) {
             if (response.data) {
-              self.nostrrelayLinks = response.data.map(maprelays)
+              console.log(response.data)
+              response.data.map(maplrelays)
+              self.nostrrelayLinks = response.data
+              console.log(self.nostrrelayLinks)
             }
           })
           .catch(function (error) {
@@ -284,7 +295,7 @@
     },
     created: function () {
       var self = this
-      this.getrelays()
+      this.getRelays()
       this.getLists()
     }
   })
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index f00c43a3..90d03eba 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -1,6 +1,5 @@
 from http import HTTPStatus
 import asyncio
-import asyncio
 from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
@@ -8,14 +7,17 @@ from fastapi.templating import Jinja2Templates
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
 from . import nostradmin_ext, nostr_renderer
+# FastAPI good for incoming
 from fastapi import Request, WebSocket, WebSocketDisconnect
+# Websockets needed for outgoing 
+import websockets
 
 from lnbits.core.crud import update_payment_status
 from lnbits.core.models import User
 from lnbits.core.views.api import api_payment
 from lnbits.decorators import check_user_exists
 
-from .crud import get_nostrkeys
+from .crud import get_nostrkeys, get_nostrrelay
 
 templates = Jinja2Templates(directory="templates")
 
@@ -74,8 +76,8 @@ class ConnectionManager:
 manager = ConnectionManager()
 
 
-@nostradmin_ext.websocket("/nostradmin/ws/{nostr_id}", name="nostr_id.websocket_by_id")
-async def websocket_endpoint(websocket: WebSocket, copilot_id: str):
+@nostradmin_ext.websocket("/nostradmin/ws/relayevents/{nostr_id}", name="nostr_id.websocket_by_id")
+async def websocket_endpoint(websocket: WebSocket, nostr_id: str):
     await manager.connect(websocket, nostr_id)
     try:
         while True:
@@ -88,4 +90,13 @@ async def updater(nostr_id, message):
     copilot = await get_copilot(nostr_id)
     if not copilot:
         return
-    await manager.send_personal_message(f"{message}", nostr_id)
\ No newline at end of file
+    await manager.send_personal_message(f"{message}", nostr_id)
+
+
+async def relay_check(relay: str):
+    async with websockets.connect(relay) as websocket:
+            if str(websocket.state) == "State.OPEN":
+                print(str(websocket.state))
+                return True
+            else:
+                return False
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
index ad8bcf17..4ff89704 100644
--- a/lnbits/extensions/nostradmin/views_api.py
+++ b/lnbits/extensions/nostradmin/views_api.py
@@ -24,11 +24,10 @@ from .crud import (
     get_nostrconnections,
 )
 from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
-
+from .views import relay_check
 
 @nostradmin_ext.get("/api/v1/relays")
 async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
-
     relays = await get_nostrrelays()
     if not relays:
         await create_nostrrelays(nostrCreateRelays(relay="wss://relayer.fiatjaf.com"))
@@ -36,10 +35,16 @@ async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
             nostrCreateRelays(relay="wss://nostr-pub.wellorder.net")
         )
         relays = await get_nostrrelays()
-    try:
-        return [{**relays.dict()} for relays in await relays]
-    except:
-        None
+    if not relays:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+    else:
+        for relay in relays:
+            relay.status = await relay_check(relay.relay)
+        return relays
+
+
 
 @nostradmin_ext.get("/api/v1/relaylist")
 async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):

From ec8c504f28d14d3100ec787b4f1a410a40f1cce6 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Thu, 10 Feb 2022 13:54:36 +0000
Subject: [PATCH 048/174] wdvds

---
 lnbits/extensions/diagonalley/__init__.py | 34 ++++++++++++++---------
 lnbits/extensions/diagonalley/config.json |  8 +++---
 lnbits/extensions/nostradmin/__init__.py  | 33 ++++++++++++++++++----
 lnbits/extensions/nostradmin/views.py     |  1 +
 4 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index 388c08db..dc7b0efb 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -1,28 +1,36 @@
 import asyncio
 
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 from fastapi.staticfiles import StaticFiles
 
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
 from lnbits.tasks import catch_everything_and_restart
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+from http import HTTPStatus
 
-db = Database("ext_diagonalley")
-
+from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
 
 diagonalley_ext: APIRouter = APIRouter(
     prefix="/diagonalley", tags=["diagonalley"]
 )
+db = Database("ext_diagonalley")
+if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
+    @diagonalley_ext.get("/", response_class=HTMLResponse)
+    async def index(request: Request):
+        return template_renderer().TemplateResponse(
+                "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
+            )
+else:
+    def diagonalley_renderer():
+        return template_renderer(["lnbits/extensions/diagonalley/templates"])
 
-def diagonalley_renderer():
-    return template_renderer(["lnbits/extensions/diagonalley/templates"])
+    from .tasks import wait_for_paid_invoices
+    from .views import *  # noqa
+    from .views_api import *  # noqa
 
 
-from .tasks import wait_for_paid_invoices
-from .views import *  # noqa
-from .views_api import *  # noqa
-
-
-def diagonalley_start():
-    loop = asyncio.get_event_loop()
-    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
\ No newline at end of file
+    def diagonalley_start():
+        loop = asyncio.get_event_loop()
+        loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
\ No newline at end of file
diff --git a/lnbits/extensions/diagonalley/config.json b/lnbits/extensions/diagonalley/config.json
index 99e92e9b..8ad41727 100644
--- a/lnbits/extensions/diagonalley/config.json
+++ b/lnbits/extensions/diagonalley/config.json
@@ -1,6 +1,6 @@
 {
-    "name": "Diagon Alley",
-    "short_description": "Movable anonymous market stand",
-    "icon": "add_shopping_cart",
-    "contributors": ["benarc","DeanH"]
+  "name": "Diagon Alley",
+  "short_description": "Nostr shop system",
+  "icon": "add_shopping_cart",
+  "contributors": ["benarc"]
 }
diff --git a/lnbits/extensions/nostradmin/__init__.py b/lnbits/extensions/nostradmin/__init__.py
index 797542c4..91586000 100644
--- a/lnbits/extensions/nostradmin/__init__.py
+++ b/lnbits/extensions/nostradmin/__init__.py
@@ -1,16 +1,37 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
 
-db = Database("ext_nostradmin")
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+from http import HTTPStatus
+
+from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
 
 nostradmin_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
 
+db = Database("ext_nostradmin")
+if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
+    @nostradmin_ext.get("/", response_class=HTMLResponse)
+    async def index(request: Request):
+        return template_renderer().TemplateResponse(
+                "error.html", {"request": request, "err": "NostrAdmin must be added to LNBITS_ADMIN_EXTENSIONS in .env"}
+            )
+else:
+    
+    def nostr_renderer():
+        return template_renderer(["lnbits/extensions/nostradmin/templates"])
+
+    from .views import *  # noqa
+    from .views_api import *  # noqa
+
+
+
+
+
+
+
 
-def nostr_renderer():
-    return template_renderer(["lnbits/extensions/nostradmin/templates"])
 
 
-from .views import *  # noqa
-from .views_api import *  # noqa
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 90d03eba..8e421abb 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -21,6 +21,7 @@ from .crud import get_nostrkeys, get_nostrrelay
 
 templates = Jinja2Templates(directory="templates")
 
+nostradmin = True
 
 @nostradmin_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):

From 734a72d7a0060c98bd2d3aae25eb84f17b0b6884 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Sat, 12 Feb 2022 12:40:12 +0000
Subject: [PATCH 049/174] blah

---
 .../templates/diagonalley/index.html          | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 6d6ea872..8f33fdcd 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -223,10 +223,10 @@
         </q-select>
         <div class="row">
           <div class="col-5">
-            <q-btn unelevated color="primary">Generate keys</q-btn>
+            <q-btn unelevated @onclick="generateKeys" color="primary">Generate keys</q-btn>
           </div>
           <div class="col-5">
-            <q-btn unelevated color="primary">Restore keys</q-btn>
+            <q-btn unelevated @onclick="restoreKeys" color="primary">Restore keys</q-btn>
           </div>
         </div>
         <q-input
@@ -301,7 +301,7 @@
     <q-card>
       <q-card-section>
       
-        <q-btn unelevated v-if="stalls.length > 1" color="primary" @click="productDialog.show = true"
+        <q-btn unelevated v-if="stalls.length > 0" color="primary" @click="productDialog.show = true"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
@@ -310,7 +310,7 @@
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated v-if="zones.length > 1" color="primary" @click="openStallDialog()"
+        <q-btn unelevated v-if="zones.length > 0" color="primary" @click="openStallDialog()"
           >+ Stall
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
@@ -665,6 +665,10 @@ var mapOrders = obj => {
   obj._data = _.clone(obj)
   return obj
 }
+var mapKeys = obj => {
+  obj._data = _.clone(obj)
+  return obj
+}
 
 new Vue({
   el: '#vue',
@@ -911,6 +915,26 @@ new Vue({
     }
   },
   methods: {
+    generateKeys: function(){
+      var self = this
+      LNbits.api
+        .request(
+          'GET',
+          '/diagonalley/api/v1/keys',
+          self.g.user.wallets[0].adminkey
+        )
+        .then(function (response) {
+          if (response.data) {
+            self.keys = response.data.map(mapKeys)
+          }
+        })
+        .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+    },
+    restoreKeys: function(){
+      
+    },
     capitalizeFirstLetter: function (string) {
       return string.charAt(0).toUpperCase() + string.slice(1);
     },

From 08f124b6f912bc12a71b1d200f6e7a4df261082b Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Thu, 17 Feb 2022 23:17:44 +0000
Subject: [PATCH 050/174] Fusion44s relay_manager added to nostradmin

---
 lnbits/extensions/nostradmin/relay_manager.py | 105 ++++++++++++++++++
 lnbits/extensions/nostradmin/views.py         |  25 +++--
 2 files changed, 121 insertions(+), 9 deletions(-)
 create mode 100644 lnbits/extensions/nostradmin/relay_manager.py

diff --git a/lnbits/extensions/nostradmin/relay_manager.py b/lnbits/extensions/nostradmin/relay_manager.py
new file mode 100644
index 00000000..cc880ad8
--- /dev/null
+++ b/lnbits/extensions/nostradmin/relay_manager.py
@@ -0,0 +1,105 @@
+import asyncio
+import logging
+from typing import Any, Dict
+
+import websockets
+
+
+# Many thanks to Fusion44 for https://gist.github.com/fusion44/9af0b054b4609012752b0c8c1dafbd4a
+
+class Relay:
+    url: str
+    read: bool
+    write: bool
+    active: bool
+    _connection: Any
+
+    def __init__(self, url: str, read: bool, write: bool, active: bool) -> None:
+        self.url = url
+        self.read = read
+        self.write = write
+        self.active = active
+
+    async def connect(self):
+        self._connection = await websockets.connect(self.url)
+
+    async def send(self, message):
+        if not self.write or not self.active:
+            raise RuntimeError("Can't send to a relay that is inactive or not writable")
+        await self._connection.send(message)
+
+    async def listen(self):
+        if not self.read or not self.active:
+            raise RuntimeError(
+                "Can't listen to a relay that is inactive or not readable"
+            )
+
+        while True:
+            try:
+                msg = await self._connection.recv()
+                yield msg
+            except websockets.ConnectionClosedOK:
+                break
+
+
+class RelayManager:
+    _relays: Dict[str, Relay] = {}
+    _tasks: Dict[str, asyncio.Task] = {}
+    msg_channel = asyncio.Queue()
+
+    def __init__(self, enable_ws_debugger=False) -> None:
+        if enable_ws_debugger:
+            logger = logging.getLogger("websockets")
+            logger.setLevel(logging.DEBUG)
+            logger.addHandler(logging.StreamHandler())
+        pass
+
+    async def add_relay(self, relay: Relay):
+        if relay.url in self._relays.keys():
+            raise RuntimeError(f"Relay {relay.url} exists")
+
+        if relay.active and relay.read:
+            await relay.connect()
+            loop = asyncio.get_event_loop()
+            t = loop.create_task(self._relay_listener(relay, self.msg_channel))
+            self._tasks[relay.url] = t
+
+        self._relays[relay.url] = relay
+
+    async def remove_relay(self, url: str):
+        if url in self._relays.keys():
+            relay = self._relays[url]
+            if relay.active:
+                t = self._tasks[url]
+                t.cancel()
+                try:
+                    await t
+                except asyncio.CancelledError:
+                    print(f"Canceled task {relay.url}")
+
+    def get_relay(self, url: str) -> Relay:
+        if not url in self._relays.keys():
+            raise RuntimeError("Relay not found")
+        return self._relays.get(url)
+
+    async def update_relay(self, relay: Relay):
+        if relay.url in self._relays.keys():
+            # remove the old relay
+            await self.remove_relay(relay.url)
+
+            # add the new relay
+            await self.add_relay(relay)
+        else:
+            raise RuntimeError("Unknown Relay")
+
+    async def send_to_all(self, message):
+        for r in self._relays.values():
+            if r.write:
+                await r.send(message=message)
+
+    async def _relay_listener(self, relay: Relay, msg_chan: asyncio.Queue):
+        print(f"listening for {relay.url}")
+        async for msg in relay.listen():
+            print(msg)
+            msg_chan.put_nowait(msg)
+        print(f"STOP listening for {relay.url}")
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
index 8e421abb..705feba7 100644
--- a/lnbits/extensions/nostradmin/views.py
+++ b/lnbits/extensions/nostradmin/views.py
@@ -18,6 +18,7 @@ from lnbits.core.views.api import api_payment
 from lnbits.decorators import check_user_exists
 
 from .crud import get_nostrkeys, get_nostrrelay
+from .relay_manager import RelayManager, Relay
 
 templates = Jinja2Templates(directory="templates")
 
@@ -38,15 +39,17 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 websocket_queue = asyncio.Queue(1000)
 
-# while True:
-async def nostr_subscribe():
-    return
-    # for the relays:
-    # async with websockets.connect("ws://localhost:8765") as websocket:
-    # for the public keys:
-    # await websocket.send("subscribe to events")
-    # await websocket.recv()
 
+mgr: RelayManager = RelayManager(enable_ws_debugger=False)
+
+# listen for events coming from relays
+
+
+async def connectToNostr():
+    while True:
+        e = await mgr.msg_channel.get()
+        print(e)
+connectToNostr
 #####################################################################
 ################### LNBITS WEBSOCKET ROUTES #########################
 #### HERE IS WHERE LNBITS FRONTEND CAN RECEIVE AND SEND MESSAGES ####
@@ -97,7 +100,11 @@ async def updater(nostr_id, message):
 async def relay_check(relay: str):
     async with websockets.connect(relay) as websocket:
             if str(websocket.state) == "State.OPEN":
-                print(str(websocket.state))
+                r = Relay(url=relay, read=True, write=True, active=True)
+                try:
+                    await mgr.add_relay(r)
+                except:
+                    None
                 return True
             else:
                 return False
\ No newline at end of file

From 99d285335e4ad71bfad1fa584097686a5b68d2b3 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 11 Jul 2022 21:38:05 +0100
Subject: [PATCH 051/174] remove nostrAdmin check

---
 lnbits/extensions/diagonalley/__init__.py | 39 +++++++++++------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index dc7b0efb..6b082a5d 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -1,36 +1,35 @@
 import asyncio
+from http import HTTPStatus
 
 from fastapi import APIRouter, Request
 from fastapi.staticfiles import StaticFiles
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
 
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
-from lnbits.tasks import catch_everything_and_restart
-from starlette.exceptions import HTTPException
-from starlette.responses import HTMLResponse
-from http import HTTPStatus
-
 from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
+from lnbits.tasks import catch_everything_and_restart
 
 diagonalley_ext: APIRouter = APIRouter(
     prefix="/diagonalley", tags=["diagonalley"]
 )
 db = Database("ext_diagonalley")
-if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
-    @diagonalley_ext.get("/", response_class=HTMLResponse)
-    async def index(request: Request):
-        return template_renderer().TemplateResponse(
-                "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
-            )
-else:
-    def diagonalley_renderer():
-        return template_renderer(["lnbits/extensions/diagonalley/templates"])
+# if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
+#     @diagonalley_ext.get("/", response_class=HTMLResponse)
+#     async def index(request: Request):
+#         return template_renderer().TemplateResponse(
+#                 "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
+#             )
+# else:
+def diagonalley_renderer():
+    return template_renderer(["lnbits/extensions/diagonalley/templates"])
 
-    from .tasks import wait_for_paid_invoices
-    from .views import *  # noqa
-    from .views_api import *  # noqa
+from .tasks import wait_for_paid_invoices
+from .views import *  # noqa
+from .views_api import *  # noqa
 
 
-    def diagonalley_start():
-        loop = asyncio.get_event_loop()
-        loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
\ No newline at end of file
+def diagonalley_start():
+    loop = asyncio.get_event_loop()
+    loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))

From e1b628886010d13821b094411f270b845f5a298b Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 11:01:15 +0100
Subject: [PATCH 052/174] add timespamp on orders, nullable nostr,user keyword

---
 lnbits/extensions/diagonalley/crud.py       |  4 ++--
 lnbits/extensions/diagonalley/migrations.py | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index d2df427c..cebb5c0b 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -102,7 +102,7 @@ async def create_diagonalley_zone(
         f"""
         INSERT INTO diagonalley.zones (
             id,
-            user,
+            "user",
             cost,
             countries
 
@@ -133,7 +133,7 @@ async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
 
 
 async def get_diagonalley_zones(user: str) -> List[Zones]:
-    rows = await db.fetchall("SELECT * FROM diagonalley.zones WHERE user = ?", (user,))
+    rows = await db.fetchall('SELECT * FROM diagonalley.zones WHERE "user" = ?', (user,))
     return [Zones(**row) for row in rows]
 
 
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 29a84419..11cd2d11 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -26,9 +26,9 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
-            publickey TEXT NOT NULL,
-            privatekey TEXT NOT NULL,
-            relays TEXT NOT NULL,
+            publickey TEXT,
+            privatekey TEXT,
+            relays TEXT,
             shippingzones TEXT NOT NULL
         );
     """
@@ -41,7 +41,7 @@ async def m001_initial(db):
         """
         CREATE TABLE diagonalley.zones (
             id TEXT PRIMARY KEY,
-            user TEXT NOT NULL,
+            "user" TEXT NOT NULL,
             cost TEXT NOT NULL,
             countries TEXT NOT NULL
         );
@@ -65,7 +65,10 @@ async def m001_initial(db):
             email TEXT NOT NULL,
             invoiceid TEXT NOT NULL,
             paid BOOLEAN NOT NULL,
-            shipped BOOLEAN NOT NULL
+            shipped BOOLEAN NOT NULL,
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )

From d3038fe49bd8ba3faba814a453efefc93845818c Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 11:02:12 +0100
Subject: [PATCH 053/174] clean up optional nostr,timestamp

---
 lnbits/extensions/diagonalley/models.py | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 743c2068..0d42c279 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -1,32 +1,24 @@
-import json
-from lib2to3.pytree import Base
-from sqlite3 import Row
-from typing import Dict, Optional
-from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+from typing import Optional
 
 from fastapi.param_functions import Query
-from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
-from starlette.requests import Request
-
-from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class Stalls(BaseModel):
     id: str
     wallet: str
     name: str
-    publickey: str
-    privatekey: str
-    relays: str
+    publickey: Optional[str]
+    privatekey: Optional[str]
+    relays: Optional[str]
     shippingzones: str
 
 class createStalls(BaseModel):
     wallet: str = Query(...)
     name: str = Query(...)
-    publickey: str = Query(...)
-    privatekey: str = Query(...)
-    relays: str = Query(...)
+    publickey: str = Query(None)
+    privatekey: str = Query(None)
+    relays: str = Query(None)
     shippingzones: str = Query(...)
 
 class createProduct(BaseModel):
@@ -50,7 +42,7 @@ class Products(BaseModel):
 
 class createZones(BaseModel):
     cost: int = Query(0, ge=0)
-    countries: str = Query(None)
+    countries: str = Query(...)
 
 class Zones(BaseModel):
     id: str
@@ -82,3 +74,4 @@ class Orders(BaseModel):
     invoiceid: str
     paid: bool
     shipped: bool
+    time: int

From 820852e08bf8d406809a11f6d594317a67016335 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 11:02:27 +0100
Subject: [PATCH 054/174] create and display zones

---
 lnbits/extensions/diagonalley/templates/diagonalley/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 8f33fdcd..73a5c975 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -685,6 +685,8 @@ new Vue({
       customerMessages: {},
       shippedModel: false,
       shippingZoneOptions: [
+        'Worldwide',
+        'Europe',
         'Australia',
         'Austria',
         'Belgium',

From 7eb0d13590ba8e5a40a1c73224807508de272277 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 15:07:56 +0100
Subject: [PATCH 055/174] stalls/stores create update with human readable zones

---
 lnbits/extensions/diagonalley/crud.py         |  2 +-
 .../templates/diagonalley/index.html          | 79 +++++++++++--------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index cebb5c0b..12cc611f 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -168,7 +168,7 @@ async def create_diagonalley_stall(
             data.publickey,
             data.privatekey,
             data.relays,
-            repr(data.shippingzones)),
+            data.shippingzones),
     )
 
     stall = await get_diagonalley_stall(stall_id)
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 73a5c975..b2ab5f9d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -221,7 +221,8 @@
           label="Wallet *"
         >
         </q-select>
-        <div class="row">
+        <!-- NOSTR -->
+        <!-- <div class="row">
           <div class="col-5">
             <q-btn unelevated @onclick="generateKeys" color="primary">Generate keys</q-btn>
           </div>
@@ -242,7 +243,7 @@
           dense
           v-model.trim="stallDialog.data.privatekey"
           label="Private Key"
-        ></q-input>
+        ></q-input> -->
         <q-select
           :options="zoneOptions"
           filled
@@ -251,7 +252,8 @@
           v-model.trim="stallDialog.data.shippingzones"
           label="Shipping Zones"
         ></q-select>
-        <q-select
+        <!-- NOSTR -->
+        <!-- <q-select
           :options="relayOptions"
           filled
           dense
@@ -271,23 +273,24 @@
           dense
           v-model.trim="stallDialog.data.nostrShops"
           label="Nostr shop public keys (seperate by comma)"
-        ></q-input>
+        ></q-input> -->
+        <p><strong><small>Nostr support coming soon!</small></strong></p>
         <div class="row q-mt-lg">
           <q-btn
             v-if="stallDialog.data.id"
             unelevated
             color="primary"
             type="submit"
-            >Update Stall</q-btn
+            >Update Store</q-btn
           >
           <q-btn
             v-else
             unelevated
             color="primary"
-            :disable="stallDialog.data.countries == null
-              || stallDialog.data.cost == null"
+            :disable="stallDialog.data.wallet == null
+              || stallDialog.data.shippingzones == null"
             type="submit"
-            >Create Stall</q-btn
+            >Create Store</q-btn
           >
           <q-btn v-close-popup flat color="grey" class="q-ml-auto"
             >Cancel</q-btn
@@ -311,11 +314,11 @@
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
         <q-btn unelevated v-if="zones.length > 0" color="primary" @click="openStallDialog()"
-          >+ Stall
+          >+ Store
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s).')"
-          >+ Stall
+          >+ Store
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="shopDialog.show = true"
@@ -469,12 +472,12 @@
         </q-table>
       </q-card-section>
     </q-card>
-
+    <!-- STORES -->
     <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">Stalls</h5>
+            <h5 class="text-subtitle1 q-my-none">Stores</h5>
           </div>
           <div class="col-auto">
             <q-btn flat color="grey" @click="exportStallsCSV"
@@ -528,7 +531,7 @@
         </q-table>
       </q-card-section>
     </q-card>
-
+    <!-- ZONES -->
     <q-card>
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
@@ -964,7 +967,7 @@ new Vue({
       LNbits.api
         .request(
           'GET',
-          '/diagonalley/api/v1/stalls?all_wallets',
+          '/diagonalley/api/v1/stalls?all_wallets=true',
           self.g.user.wallets[0].adminkey
         )
         .then(function (response) {
@@ -977,49 +980,59 @@ new Vue({
           })
     },
     openStallDialog: function () {
-      console.log(this.zones[0]['id'])
-      for(let i = 0; i < this.zones.length; i ++){
-        this.zoneOptions.push(this.zones[i]['id'])
-      }
+      this.zoneOptions = this.zones.map(z => `${z.id} - ${z.countries}`)
+      //console.log(this.zones[0]['id'])
+      //for(let i = 0; i < this.zones.length; i ++){
+      //  this.zoneOptions.push(this.zones[i]['id'])
+      //}
       this.stallDialog.show = true
     },
     openStallUpdateDialog: function (linkId) {
       var self = this
       var link = _.findWhere(self.stalls, {id: linkId})
-      for(let i = 0; i < this.zones.length; i ++){
-        this.zoneOptions.push(this.stalls[i][0])
-      }
+      this.zoneOptions = this.zones.map(z => `${z.id} - ${z.countries}`)
+      //for(let i = 0; i < this.zones.length; i ++){
+      //  this.zoneOptions.push(this.stalls[i][0])
+      //}
       this.stallDialog.data = _.clone(link._data)
+      let shippingzones = this.zoneOptions.filter(z => this.stallDialog.data.shippingzones.split(",").includes(z.split("-")[0].trim()))
+        
+      this.stallDialog.data.shippingzones = shippingzones//this.stallDialog.data.shippingzones.split(",")
+
+      console.log(this.stallDialog.data)
+      //let zones = this.zoneOptions
+      //  .filter(z => z.id == )
       this.stallDialog.show = true
     },
     sendStallFormData: function () {
-      if (this.stallDialog.data.id) {
-      } else {
-        var data = {
-          name: this.stallDialog.data.name,
-          wallet: this.stallDialog.data.wallet,
-          publickey: this.stallDialog.data.publickey,
-          privatekey: this.stallDialog.data.privatekey,
-          relays: this.stallDialog.data.relays
-        }
+      let data = {
+        name: this.stallDialog.data.name,
+        wallet: this.stallDialog.data.wallet,
+        publickey: this.stallDialog.data.publickey,
+        privatekey: this.stallDialog.data.privatekey,
+        relays: this.stallDialog.data.relays,
+        shippingzones: this.stallDialog.data.shippingzones
+          .map(z => z.split("-")[0].trim())
+          .toString()
       }
-
       if (this.stallDialog.data.id) {
+        this.stallDialog.data = {...this.stallDialog.data, ...data}
         this.updateStall(this.stallDialog.data)
       } else {
         this.createStall(data)
       }
     },
     updateStall: function (data) {
+      console.log(data)
       var self = this
       LNbits.api
         .request(
           'PUT',
-          '/diagonalley/api/v1/stalls' + data.id,
+          '/diagonalley/api/v1/stalls/' + data.id,
           _.findWhere(self.g.user.wallets, {
             id: self.stallDialog.data.wallet
           }).inkey,
-          _.pick(data, 'name', 'wallet', 'publickey', 'privatekey')
+          data
         )
         .then(function (response) {
           self.stalls = _.reject(self.stalls, function (obj) {

From 00e6aced53db00c3789c048672f98340609413cd Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 15:25:25 +0100
Subject: [PATCH 056/174] black'ed

---
 lnbits/extensions/diagonalley/__init__.py  |   5 +-
 lnbits/extensions/diagonalley/crud.py      |  25 ++--
 lnbits/extensions/diagonalley/models.py    |   6 +
 lnbits/extensions/diagonalley/views.py     |  11 +-
 lnbits/extensions/diagonalley/views_api.py | 132 +++++++++++++--------
 5 files changed, 106 insertions(+), 73 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index 6b082a5d..db88bdbd 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -11,9 +11,7 @@ from lnbits.helpers import template_renderer
 from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
 from lnbits.tasks import catch_everything_and_restart
 
-diagonalley_ext: APIRouter = APIRouter(
-    prefix="/diagonalley", tags=["diagonalley"]
-)
+diagonalley_ext: APIRouter = APIRouter(prefix="/diagonalley", tags=["diagonalley"])
 db = Database("ext_diagonalley")
 # if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
 #     @diagonalley_ext.get("/", response_class=HTMLResponse)
@@ -25,6 +23,7 @@ db = Database("ext_diagonalley")
 def diagonalley_renderer():
     return template_renderer(["lnbits/extensions/diagonalley/templates"])
 
+
 from .tasks import wait_for_paid_invoices
 from .views import *  # noqa
 from .views_api import *  # noqa
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 12cc611f..fec2778c 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -24,9 +24,8 @@ from .models import (
 
 ###Products
 
-async def create_diagonalley_product(
-    data: createProduct
-) -> Products:
+
+async def create_diagonalley_product(data: createProduct) -> Products:
     product_id = urlsafe_short_hash()
     await db.execute(
         f"""
@@ -93,10 +92,7 @@ async def delete_diagonalley_product(product_id: str) -> None:
 ###zones
 
 
-async def create_diagonalley_zone(
-    user,
-    data: createZones
-) -> Zones:
+async def create_diagonalley_zone(user, data: createZones) -> Zones:
     zone_id = urlsafe_short_hash()
     await db.execute(
         f"""
@@ -133,7 +129,9 @@ async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
 
 
 async def get_diagonalley_zones(user: str) -> List[Zones]:
-    rows = await db.fetchall('SELECT * FROM diagonalley.zones WHERE "user" = ?', (user,))
+    rows = await db.fetchall(
+        'SELECT * FROM diagonalley.zones WHERE "user" = ?', (user,)
+    )
     return [Zones(**row) for row in rows]
 
 
@@ -144,9 +142,7 @@ async def delete_diagonalley_zone(zone_id: str) -> None:
 ###Stalls
 
 
-async def create_diagonalley_stall(
-    data: createStalls
-) -> Stalls:
+async def create_diagonalley_stall(data: createStalls) -> Stalls:
     stall_id = urlsafe_short_hash()
     await db.execute(
         f"""
@@ -168,7 +164,8 @@ async def create_diagonalley_stall(
             data.publickey,
             data.privatekey,
             data.relays,
-            data.shippingzones),
+            data.shippingzones,
+        ),
     )
 
     stall = await get_diagonalley_stall(stall_id)
@@ -210,9 +207,7 @@ async def delete_diagonalley_stall(stall_id: str) -> None:
 ###Orders
 
 
-async def create_diagonalley_order(
-    data: createOrder
-) -> Orders:
+async def create_diagonalley_order(data: createOrder) -> Orders:
 
     order_id = urlsafe_short_hash()
     await db.execute(
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 0d42c279..5b0f3d5c 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -13,6 +13,7 @@ class Stalls(BaseModel):
     relays: Optional[str]
     shippingzones: str
 
+
 class createStalls(BaseModel):
     wallet: str = Query(...)
     name: str = Query(...)
@@ -21,6 +22,7 @@ class createStalls(BaseModel):
     relays: str = Query(None)
     shippingzones: str = Query(...)
 
+
 class createProduct(BaseModel):
     stall: str = Query(None)
     product: str = Query(None)
@@ -30,6 +32,7 @@ class createProduct(BaseModel):
     price: int = Query(0, ge=0)
     quantity: int = Query(0, ge=0)
 
+
 class Products(BaseModel):
     id: str
     stall: str
@@ -40,10 +43,12 @@ class Products(BaseModel):
     price: int
     quantity: int
 
+
 class createZones(BaseModel):
     cost: int = Query(0, ge=0)
     countries: str = Query(...)
 
+
 class Zones(BaseModel):
     id: str
     user: str
@@ -61,6 +66,7 @@ class createOrder(BaseModel):
     email: str = Query(...)
     invoiceid: str = Query(...)
 
+
 class Orders(BaseModel):
     id: str
     productid: str
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index ae0899ca..c38f8d51 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -1,4 +1,3 @@
-
 from http import HTTPStatus
 
 from fastapi import Request
@@ -15,21 +14,27 @@ from .crud import get_diagonalley_products
 
 templates = Jinja2Templates(directory="templates")
 
+
 @diagonalley_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/index.html", {"request": request, "user": user.dict()}
     )
 
+
 @diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
     product = await get_diagonalley_products(stall_id)
-    
+
     if not product:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
         )
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
-        {"stall": [product.dict() for product in await get_diagonalley_products(stall_id)]}
+        {
+            "stall": [
+                product.dict() for product in await get_diagonalley_products(stall_id)
+            ]
+        },
     )
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 6363dc97..c91eecf5 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -65,36 +65,35 @@ async def api_copilot_retrieve(
     return {**copilot.dict(), **{"lnurl": copilot.lnurl(req)}}
 """
 
+
 @diagonalley_ext.get("/api/v1/products")
 async def api_diagonalley_products(
     req: Request,
     wallet: WalletTypeInfo = Depends(get_key_type),
-    all_stalls: bool = Query(False)
+    all_stalls: bool = Query(False),
 ):
     wallet_ids = [wallet.wallet.id]
 
     if all_stalls:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([product.dict() for product in await get_diagonalley_products(wallet_ids)])
+    return [product.dict() for product in await get_diagonalley_products(wallet_ids)]
 
 
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
-    product_id, 
-    data: createProduct, 
-    wallet: WalletTypeInfo = Depends(get_key_type)
-    ):
+    product_id, data: createProduct, wallet: WalletTypeInfo = Depends(get_key_type)
+):
 
     if product_id:
         product = await get_diagonalley_product(product_id)
 
         if not product:
-            return ({"message": "Withdraw product does not exist."})
+            return {"message": "Withdraw product does not exist."}
 
         if product.wallet != wallet.wallet.id:
-            return ({"message": "Not your withdraw product."})
+            return {"message": "Not your withdraw product."}
 
         product = await update_diagonalley_product(product_id, **data.dict())
     else:
@@ -104,14 +103,16 @@ async def api_diagonalley_product_create(
 
 
 @diagonalley_ext.delete("/api/v1/products/{product_id}")
-async def api_diagonalley_products_delete(product_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_products_delete(
+    product_id, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     product = await get_diagonalley_product(product_id)
 
     if not product:
-        return ({"message": "Product does not exist."})
+        return {"message": "Product does not exist."}
 
     if product.wallet != wallet.wallet.id:
-        return ({"message": "Not your Diagon Alley."})
+        return {"message": "Not your Diagon Alley."}
 
     await delete_diagonalley_product(product_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
@@ -125,38 +126,41 @@ async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
 
     return await get_diagonalley_zones(wallet.wallet.user)
 
+
 @diagonalley_ext.post("/api/v1/zones")
 async def api_diagonalley_zone_create(
-    data: createZones, 
-    wallet: WalletTypeInfo = Depends(get_key_type)
-    ):
+    data: createZones, wallet: WalletTypeInfo = Depends(get_key_type)
+):
     zone = await create_diagonalley_zone(user=wallet.wallet.user, data=data)
     return zone.dict()
 
+
 @diagonalley_ext.post("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_update(
-    data: createZones, 
-    zone_id: str = Query(None),  
-    wallet: WalletTypeInfo = Depends(require_admin_key)
-    ):
+    data: createZones,
+    zone_id: str = Query(None),
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+):
     zone = await get_diagonalley_zone(zone_id)
     if not zone:
-        return ({"message": "Zone does not exist."})
+        return {"message": "Zone does not exist."}
     if zone.user != wallet.wallet.user:
-        return ({"message": "Not your record."})
+        return {"message": "Not your record."}
     zone = await update_diagonalley_zone(zone_id, **data.dict())
     return zone
 
 
 @diagonalley_ext.delete("/api/v1/zones/{zone_id}")
-async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_zone_delete(
+    zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     zone = await get_diagonalley_zone(zone_id)
 
     if not zone:
-        return ({"message": "zone does not exist."})
+        return {"message": "zone does not exist."}
 
     if zone.user != wallet.wallet.user:
-        return ({"message": "Not your zone."})
+        return {"message": "Not your zone."}
 
     await delete_diagonalley_zone(zone_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
@@ -166,27 +170,33 @@ async def api_diagonalley_zone_delete(zone_id, wallet: WalletTypeInfo = Depends(
 
 
 @diagonalley_ext.get("/api/v1/stalls")
-async def api_diagonalley_stalls(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
+async def api_diagonalley_stalls(
+    wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
+):
     wallet_ids = [wallet.wallet.id]
 
     if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return ([stall.dict() for stall in await get_diagonalley_stalls(wallet_ids)])
+    return [stall.dict() for stall in await get_diagonalley_stalls(wallet_ids)]
 
 
 @diagonalley_ext.post("/api/v1/stalls")
 @diagonalley_ext.put("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_create(
+    data: createStalls,
+    stall_id: str = Query(None),
+    wallet: WalletTypeInfo = Depends(get_key_type),
+):
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
 
         if not stall:
-            return ({"message": "Withdraw stall does not exist."})
+            return {"message": "Withdraw stall does not exist."}
 
         if stall.wallet != wallet.wallet.id:
-            return ({"message": "Not your withdraw stall."})
+            return {"message": "Not your withdraw stall."}
 
         stall = await update_diagonalley_stall(stall_id, **data.dict())
     else:
@@ -196,14 +206,16 @@ async def api_diagonalley_stall_create(data: createStalls, stall_id: str = Query
 
 
 @diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_stall_delete(
+    stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     stall = await get_diagonalley_stall(stall_id)
 
     if not stall:
-        return ({"message": "Stall does not exist."})
+        return {"message": "Stall does not exist."}
 
     if stall.wallet != wallet.wallet.id:
-        return ({"message": "Not your Stall."})
+        return {"message": "Not your Stall."}
 
     await delete_diagonalley_stall(stall_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
@@ -213,33 +225,39 @@ async def api_diagonalley_stall_delete(stall_id: str = Query(None), wallet: Wall
 
 
 @diagonalley_ext.get("/api/v1/orders")
-async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
+async def api_diagonalley_orders(
+    wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
+):
     wallet_ids = [wallet.wallet.id]
 
     if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
     try:
-        return ([order.dict() for order in await get_diagonalley_orders(wallet_ids)])
+        return [order.dict() for order in await get_diagonalley_orders(wallet_ids)]
     except:
-        return ({"message": "We could not retrieve the orders."})
+        return {"message": "We could not retrieve the orders."}
 
 
 @diagonalley_ext.post("/api/v1/orders")
-async def api_diagonalley_order_create(data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_order_create(
+    data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
+):
     order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
     return order.dict()
 
 
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
-async def api_diagonalley_order_delete(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_order_delete(
+    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+):
     order = await get_diagonalley_order(order_id)
 
     if not order:
-        return ({"message": "Order does not exist."})
+        return {"message": "Order does not exist."}
 
     if order.wallet != wallet.wallet.id:
-        return ({"message": "Not your Order."})
+        return {"message": "Not your Order."}
 
     await delete_diagonalley_order(order_id)
 
@@ -247,7 +265,9 @@ async def api_diagonalley_order_delete(order_id: str = Query(None), wallet: Wall
 
 
 @diagonalley_ext.get("/api/v1/orders/paid/{order_id}")
-async def api_diagonalley_order_paid(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_order_paid(
+    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     await db.execute(
         "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
         (
@@ -259,7 +279,9 @@ async def api_diagonalley_order_paid(order_id: str = Query(None), wallet: Wallet
 
 
 @diagonalley_ext.get("/api/v1/orders/shipped/{order_id}")
-async def api_diagonalley_order_shipped(order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_order_shipped(
+    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+):
     await db.execute(
         "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
         (
@@ -271,54 +293,60 @@ async def api_diagonalley_order_shipped(order_id: str = Query(None), wallet: Wal
         "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
     )
 
-    return ([order.dict() for order in get_diagonalley_orders(order["wallet"])])
+    return [order.dict() for order in get_diagonalley_orders(order["wallet"])]
 
 
 ###List products based on stall id
 
 
 @diagonalley_ext.get("/api/v1/stall/products/{stall_id}")
-async def api_diagonalley_stall_products(stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_products(
+    stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+):
 
     rows = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
     print(rows[1])
     if not rows:
-        return ({"message": "Stall does not exist."})
+        return {"message": "Stall does not exist."}
 
     products = db.fetchone(
         "SELECT * FROM diagonalley.products WHERE wallet = ?", (rows[1],)
     )
     if not products:
-        return ({"message": "No products"})
+        return {"message": "No products"}
 
-    return ([products.dict() for products in await get_diagonalley_products(rows[1])])
+    return [products.dict() for products in await get_diagonalley_products(rows[1])]
 
 
 ###Check a product has been shipped
 
 
 @diagonalley_ext.get("/api/v1/stall/checkshipped/{checking_id}")
-async def api_diagonalley_stall_checkshipped(checking_id, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_checkshipped(
+    checking_id, wallet: WalletTypeInfo = Depends(get_key_type)
+):
     rows = await db.fetchone(
         "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
     )
-    return ({"shipped": rows["shipped"]})
+    return {"shipped": rows["shipped"]}
 
 
 ###Place order
 
 
 @diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
-async def api_diagonalley_stall_order(stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_stall_order(
+    stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
+):
     product = await get_diagonalley_product(data.productid)
     shipping = await get_diagonalley_stall(stall_id)
 
     if data.shippingzone == 1:
-        shippingcost = shipping.zone1cost #missing in model
+        shippingcost = shipping.zone1cost  # missing in model
     else:
-        shippingcost = shipping.zone2cost #missing in model
+        shippingcost = shipping.zone2cost  # missing in model
 
     checking_id, payment_request = await create_invoice(
         wallet_id=product.wallet,
@@ -334,7 +362,7 @@ async def api_diagonalley_stall_order(stall_id, data: createOrder, wallet: Walle
         (
             selling_id,
             data.productid,
-            product.wallet, #doesn't exist in model
+            product.wallet,  # doesn't exist in model
             product.product,
             data.quantity,
             data.shippingzone,
@@ -345,4 +373,4 @@ async def api_diagonalley_stall_order(stall_id, data: createOrder, wallet: Walle
             False,
         ),
     )
-    return ({"checking_id": checking_id, "payment_request": payment_request})
+    return {"checking_id": checking_id, "payment_request": payment_request}

From 5618de2cd368b7e666b295fa2435d579a3289647 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 15:29:46 +0100
Subject: [PATCH 057/174] fix create edit delete permissions

---
 .../diagonalley/templates/diagonalley/index.html         | 2 +-
 lnbits/extensions/diagonalley/views_api.py               | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index b2ab5f9d..d7660bc9 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1079,7 +1079,7 @@ new Vue({
             .request(
               'DELETE',
               '/diagonalley/api/v1/stalls/' + stallId,
-              _.findWhere(self.g.user.wallets, {id: stall.wallet}).inkey
+              _.findWhere(self.g.user.wallets, {id: stall.wallet}).adminkey
             )
             .then(function (response) {
               self.stalls = _.reject(self.stalls, function (obj) {
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index c91eecf5..06a854f0 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -9,7 +9,12 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
-from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
+from lnbits.decorators import (
+    WalletTypeInfo,
+    get_key_type,
+    require_admin_key,
+    require_invoice_key,
+)
 
 from . import db, diagonalley_ext
 from .crud import (
@@ -186,7 +191,7 @@ async def api_diagonalley_stalls(
 async def api_diagonalley_stall_create(
     data: createStalls,
     stall_id: str = Query(None),
-    wallet: WalletTypeInfo = Depends(get_key_type),
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
 
     if stall_id:

From 83fe977a85c4d751caa1d472b7a8037da84858a1 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 12 Jul 2022 17:22:03 +0100
Subject: [PATCH 058/174] create product

---
 lnbits/extensions/diagonalley/crud.py         | 11 +--
 lnbits/extensions/diagonalley/models.py       |  2 +-
 .../templates/diagonalley/index.html          | 69 ++++++++++---------
 lnbits/extensions/diagonalley/views_api.py    |  7 +-
 4 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index fec2778c..117a2379 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -70,18 +70,19 @@ async def get_diagonalley_product(product_id: str) -> Optional[Products]:
     return Products(**row) if row else None
 
 
-async def get_diagonalley_products(wallet_ids: Union[str, List[str]]) -> List[Products]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
+async def get_diagonalley_products(stall_ids: Union[str, List[str]]) -> List[Products]:
+    if isinstance(stall_ids, str):
+        stall_ids = [stall_ids]
 
     # with open_ext_db("diagonalley") as db:
-    q = ",".join(["?"] * len(wallet_ids))
+    q = ",".join(["?"] * len(stall_ids))
     rows = await db.fetchall(
         f"""
         SELECT * FROM diagonalley.products WHERE stall IN ({q})
         """,
-        (*wallet_ids,),
+        (*stall_ids,),
     )
+    print("PRODS", rows)
     return [Products(**row) for row in rows]
 
 
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 5b0f3d5c..9557f6e9 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -24,7 +24,7 @@ class createStalls(BaseModel):
 
 
 class createProduct(BaseModel):
-    stall: str = Query(None)
+    stall: str = Query(...)
     product: str = Query(None)
     categories: str = Query(None)
     description: str = Query(None)
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index d7660bc9..a804898d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -9,7 +9,7 @@
           dense
           emit-value
           v-model="productDialog.data.stall"
-          :options="stalls"
+          :options="stalls.map(s => ({label: s.name, value: s.id}))"
           label="Stall"
         >
         </q-select>
@@ -100,7 +100,7 @@
             v-else
             unelevated
             color="primary"
-            :disable="productDialog.data.image == null
+            :disable="productDialog.data.price == null
               || productDialog.data.product == null
               || productDialog.data.description == null
               || productDialog.data.quantity == null"
@@ -645,34 +645,38 @@
 </div>
 </div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-
+<script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
 <script>
 
 Vue.component(VueQrcode.name, VueQrcode)
 
-//const pica = window.pica()
+const pica = window.pica()
 
-var mapStalls = obj => {
+const mapStalls = obj => {
   obj._data = _.clone(obj)
   return obj
 }
-var mapProducts = obj => {
+const mapProducts = obj => {
   obj._data = _.clone(obj)
   return obj
 }
-var mapZone = obj => {
+const mapZone = obj => {
   obj._data = _.clone(obj)
   return obj
 }
-var mapOrders = obj => {
+const mapOrders = obj => {
   obj._data = _.clone(obj)
   return obj
 }
-var mapKeys = obj => {
+const mapKeys = obj => {
   obj._data = _.clone(obj)
   return obj
 }
 
+const humanReadableZones = (zones) => {
+  return zones.map(z => `${z.id} - ${z.countries}`)
+}
+
 new Vue({
   el: '#vue',
   mixins: [windowMixin],
@@ -973,6 +977,7 @@ new Vue({
         .then(function (response) {
           if (response.data) {
             self.stalls = response.data.map(mapStalls)
+            console.log(self.stalls)
           }
         })
         .catch(function (error) {
@@ -980,20 +985,13 @@ new Vue({
           })
     },
     openStallDialog: function () {
-      this.zoneOptions = this.zones.map(z => `${z.id} - ${z.countries}`)
-      //console.log(this.zones[0]['id'])
-      //for(let i = 0; i < this.zones.length; i ++){
-      //  this.zoneOptions.push(this.zones[i]['id'])
-      //}
+      this.zoneOptions = humanReadableZones(this.zones)
       this.stallDialog.show = true
     },
     openStallUpdateDialog: function (linkId) {
       var self = this
       var link = _.findWhere(self.stalls, {id: linkId})
-      this.zoneOptions = this.zones.map(z => `${z.id} - ${z.countries}`)
-      //for(let i = 0; i < this.zones.length; i ++){
-      //  this.zoneOptions.push(this.stalls[i][0])
-      //}
+      this.zoneOptions = humanReadableZones(this.zones)
       this.stallDialog.data = _.clone(link._data)
       let shippingzones = this.zoneOptions.filter(z => this.stallDialog.data.shippingzones.split(",").includes(z.split("-")[0].trim()))
         
@@ -1103,10 +1101,11 @@ new Vue({
       LNbits.api
         .request(
           'GET',
-          '/diagonalley/api/v1/products?all_stalls',
+          '/diagonalley/api/v1/products?all_stalls=true',
           self.g.user.wallets[0].inkey
         )
         .then(function (response) {
+          console.log(response.data)
           if (response.data) {
             self.products = response.data.map(mapProducts)
           }
@@ -1123,21 +1122,19 @@ new Vue({
       self.productDialog.show = true
     },
     sendProductFormData: function () {
-      if (this.productDialog.data.id) {
-      } else {
-        var data = {
-          product: this.productDialog.data.product,
-          categories:
-            this.productDialog.data.categories +
-            this.productDialog.categoriesextra,
-          description: this.productDialog.data.description,
-          image: this.productDialog.data.image,
-          price: this.productDialog.data.price,
-          quantity: this.productDialog.data.quantity
-        }
+      var data = {
+        stall: this.productDialog.data.stall,
+        product: this.productDialog.data.product,
+        categories:
+          this.productDialog.data.categories +
+          this.productDialog.categoriesextra,
+        description: this.productDialog.data.description,
+        image: this.productDialog.data.image,
+        price: this.productDialog.data.price,
+        quantity: this.productDialog.data.quantity
       }
       if (this.productDialog.data.id) {
-        this.updateProduct(this.productDialog.data)
+        this.updateProduct({...this.productDialog.data, ...data})
       } else {
         this.createProduct(data)
       }
@@ -1199,12 +1196,16 @@ new Vue({
     },
     createProduct: function (data) {
       var self = this
+      let wallet = _.findWhere(this.stalls, {
+        id: self.productDialog.data.stall
+      }).wallet
+      console.log(wallet)
       LNbits.api
         .request(
           'POST',
           '/diagonalley/api/v1/products',
           _.findWhere(self.g.user.wallets, {
-            id: self.productDialog.data.wallet
+            id: wallet
           }).inkey,
           data
         )
@@ -1570,7 +1571,7 @@ new Vue({
         'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
         'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
       ]
-      console.log(this.products.length)
+      console.log(_.pick(this.g.user, "id")) 
     }
   }
 })
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 06a854f0..d5e5e382 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -73,7 +73,6 @@ async def api_copilot_retrieve(
 
 @diagonalley_ext.get("/api/v1/products")
 async def api_diagonalley_products(
-    req: Request,
     wallet: WalletTypeInfo = Depends(get_key_type),
     all_stalls: bool = Query(False),
 ):
@@ -82,13 +81,15 @@ async def api_diagonalley_products(
     if all_stalls:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return [product.dict() for product in await get_diagonalley_products(wallet_ids)]
+    stalls = [stall.id for stall in await get_diagonalley_stalls(wallet_ids)]
+    
+    return [product.dict() for product in await get_diagonalley_products(stalls)]
 
 
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
-    product_id, data: createProduct, wallet: WalletTypeInfo = Depends(get_key_type)
+    data: createProduct, product_id = None, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
 
     if product_id:

From e8e161098f3835eb70e50aa6deab82a731c83bd5 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 15 Jul 2022 10:22:13 +0100
Subject: [PATCH 059/174] create and edit products

---
 lnbits/extensions/diagonalley/crud.py         |   4 +-
 lnbits/extensions/diagonalley/migrations.py   |   6 +-
 lnbits/extensions/diagonalley/models.py       |   8 +-
 .../templates/diagonalley/index.html          | 196 +++++++++---------
 lnbits/extensions/diagonalley/views_api.py    |  34 +--
 5 files changed, 131 insertions(+), 117 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 117a2379..44864b80 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -51,7 +51,6 @@ async def create_diagonalley_product(data: createProduct) -> Products:
 async def update_diagonalley_product(product_id: str, **kwargs) -> Optional[Stalls]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
 
-    # with open_ext_db("diagonalley") as db:
     await db.execute(
         f"UPDATE diagonalley.products SET {q} WHERE id = ?",
         (*kwargs.values(), product_id),
@@ -60,7 +59,7 @@ async def update_diagonalley_product(product_id: str, **kwargs) -> Optional[Stal
         "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
     )
 
-    return get_diagonalley_stall(product_id)
+    return Products(**row) if row else None
 
 
 async def get_diagonalley_product(product_id: str) -> Optional[Products]:
@@ -190,6 +189,7 @@ async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
+    print("ROW", row)
     return Stalls(**row) if row else None
 
 
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 11cd2d11..2500dbb0 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -8,9 +8,9 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             stall TEXT NOT NULL,
             product TEXT NOT NULL,
-            categories TEXT NOT NULL,
-            description TEXT NOT NULL,
-            image TEXT NOT NULL,
+            categories TEXT,
+            description TEXT,
+            image TEXT,
             price INTEGER NOT NULL,
             quantity INTEGER NOT NULL
         );
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 9557f6e9..2132d72f 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -25,7 +25,7 @@ class createStalls(BaseModel):
 
 class createProduct(BaseModel):
     stall: str = Query(...)
-    product: str = Query(None)
+    product: str = Query(...)
     categories: str = Query(None)
     description: str = Query(None)
     image: str = Query(None)
@@ -37,9 +37,9 @@ class Products(BaseModel):
     id: str
     stall: str
     product: str
-    categories: str
-    description: str
-    image: str
+    categories: Optional[str]
+    description: Optional[str]
+    image: Optional[str]
     price: int
     quantity: int
 
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index a804898d..7c11f31f 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
 %} {% block page %}
 <div class="row q-col-gutter-md">
+  <!-- PRODUCT DIALOG -->
   <q-dialog v-model="productDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendProductFormData" class="q-gutter-md">
@@ -26,28 +27,37 @@
           v-model.trim="productDialog.data.description"
           label="Description"
         ></q-input>
-        <div class="row">
-          <div class="col-5">
+        <!-- <div class="row"> -->
+          <!-- <div class="col-5">
             <q-select
               filled
               dense
-              v-model.trim="productDialog.data.categories"
               multiple
+              v-model.trim="productDialog.data.categories"
               :options="categories"
               label="Categories"
               class="q-pr-sm"
             ></q-select>
-          </div>
-          <div class="col-7">
-            <q-input
+          </div> -->
+          <!-- <div class="col-7"> -->
+            <q-select
               filled
+              multiple
               dense
-              v-model.trim="productDialog.categoriesextra"
-              placeholder="crafts,robots,etc (seperate by comma)"
-              label="Other categories *optional"
-            ></q-input>
-          </div>
-        </div>
+              emit-value
+              v-model.trim="productDialog.data.categories"
+              use-input
+              use-chips
+              multiple
+              hide-dropdown-icon
+              input-debounce="0"
+              new-value-mode="add-unique"
+              label="Categories"
+              placeholder="crafts,robots,etc"
+              hint="Hit Enter to add"
+            ></q-select>
+          <!-- </div> -->
+        <!-- </div> -->
 
         <q-file
           class="q-pr-md"
@@ -108,14 +118,14 @@
             >Create Product</q-btn
           >
 
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('productDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
       </q-form>
     </q-card>
   </q-dialog>
-
+  <!-- ZONE DIALOG -->
   <q-dialog v-model="zoneDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendZoneFormData" class="q-gutter-md">
@@ -152,15 +162,14 @@
             >Create Shipping Zone</q-btn
           >
 
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('zoneDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
       </q-form>
     </q-card>
   </q-dialog>
-
-
+  <!-- SHOP DIALOG -->
   <q-dialog v-model="shopDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendShopFormData" class="q-gutter-md">
@@ -173,7 +182,8 @@
           filled
           dense
           multiple
-          :options="stalls"
+          emit-value
+          :options="stalls.map(s => ({label: s.name, value: s.id}))"
           label="Stalls"
           v-model.trim="shopDialog.data.stalls"
         ></q-select>
@@ -195,14 +205,14 @@
             >Launch</q-btn
           >
 
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('shopDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
       </q-form>
     </q-card>
   </q-dialog>
-
+  <!-- STALL/STORE DIALOG -->
   <q-dialog v-model="stallDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendStallFormData" class="q-gutter-md">
@@ -292,7 +302,7 @@
             type="submit"
             >Create Store</q-btn
           >
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('stallDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
@@ -328,8 +338,8 @@
       
       </q-card-section>
     </q-card>
-
-    <q-card>
+    
+    <q-card> <!-- ORDERS TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -393,7 +403,7 @@
       </q-card-section>
     </q-card>
 
-    <q-card>
+    <q-card> <!-- PRODUCTS TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -472,8 +482,8 @@
         </q-table>
       </q-card-section>
     </q-card>
-    <!-- STORES -->
-    <q-card>
+    
+    <q-card> <!-- STORES TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -531,8 +541,8 @@
         </q-table>
       </q-card-section>
     </q-card>
-    <!-- ZONES -->
-    <q-card>
+    
+    <q-card> <!-- ZONES TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -658,6 +668,7 @@ const mapStalls = obj => {
 }
 const mapProducts = obj => {
   obj._data = _.clone(obj)
+  console.log(obj)
   return obj
 }
 const mapZone = obj => {
@@ -744,7 +755,8 @@ new Vue({
         'Technology (Phones and Computers)',
         'Home (furniture and accessories)',
         'Gifts (flowers, cards, etc)',
-        'Adult'
+        'Adult',
+        'Other'
       ],
       relayOptions: [
         'wss://nostr-relay.herokuapp.com/ws',
@@ -924,6 +936,10 @@ new Vue({
     }
   },
   methods: {
+    resetDialog(dialog){
+      this[dialog].show = false
+      this[dialog].data = {}
+    },
     generateKeys: function(){
       var self = this
       LNbits.api
@@ -967,6 +983,7 @@ new Vue({
     ////////////////STALLS//////////////////
     ////////////////////////////////////////
     getStalls: function () {
+      console.log(this.g.user)
       var self = this
       LNbits.api
         .request(
@@ -1037,9 +1054,7 @@ new Vue({
             return obj.id == data.id
           })
           self.stalls.push(mapStalls(response.data))
-          self.stallDialog.show = false
-          self.stallDialog.data = {}
-          data = {}
+          self.resetDialog('stallDialog')
         })
         .catch(function (error) {
           LNbits.utils.notifyApiError(error)
@@ -1058,9 +1073,10 @@ new Vue({
         )
         .then(function (response) {
           self.stalls.push(mapStalls(response.data))
-          self.stallDialog.show = false
-          self.stallDialog.data = {}
-          data = {}
+          self.resetDialog('stallDialog')
+          //self.stallDialog.show = false
+          //self.stallDialog.data = {}
+          //data = {}
         })
         .catch(function (error) {
           LNbits.utils.notifyApiError(error)
@@ -1105,7 +1121,7 @@ new Vue({
           self.g.user.wallets[0].inkey
         )
         .then(function (response) {
-          console.log(response.data)
+          console.log("RESP DATA", response.data)
           if (response.data) {
             self.products = response.data.map(mapProducts)
           }
@@ -1119,22 +1135,24 @@ new Vue({
       var link = _.findWhere(self.products, {id: linkId})
 
       self.productDialog.data = _.clone(link._data)
+      self.productDialog.data.categories = self.productDialog.data.categories.split(",")
+      
       self.productDialog.show = true
     },
     sendProductFormData: function () {
+      let _data = {...this.productDialog.data}
       var data = {
-        stall: this.productDialog.data.stall,
-        product: this.productDialog.data.product,
-        categories:
-          this.productDialog.data.categories +
-          this.productDialog.categoriesextra,
-        description: this.productDialog.data.description,
-        image: this.productDialog.data.image,
-        price: this.productDialog.data.price,
-        quantity: this.productDialog.data.quantity
+        stall: _data.stall,
+        product: _data.product,
+        categories: _data.categories && _data.categories.toString(),
+        description: _data.description,
+        image: _data.image,
+        price: _data.price,
+        quantity: _data.quantity
       }
-      if (this.productDialog.data.id) {
-        this.updateProduct({...this.productDialog.data, ...data})
+      if (_data.id) {
+        data.id = _data.id
+        this.updateProduct(data)
       } else {
         this.createProduct(data)
       }
@@ -1163,80 +1181,72 @@ new Vue({
       this.productDialog = {...this.productDialog}
     },
     updateProduct: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/products' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.productDialog.data.wallet
-          }).inkey,
-          _.pick(
-            data,
-            'shopname',
-            'relayaddress',
-            'shippingzone1',
-            'zone1cost',
-            'shippingzone2',
-            'zone2cost',
-            'email'
-          )
-        )
-        .then(function (response) {
-          self.products = _.reject(self.products, function (obj) {
-            return obj.id == data.id
-          })
-          self.products.push(mapProducts(response.data))
-          self.productDialog.show = false
-          self.productDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createProduct: function (data) {
       var self = this
       let wallet = _.findWhere(this.stalls, {
         id: self.productDialog.data.stall
       }).wallet
-      console.log(wallet)
       LNbits.api
         .request(
-          'POST',
-          '/diagonalley/api/v1/products',
+          'PUT',
+          '/diagonalley/api/v1/products/' + data.id,
           _.findWhere(self.g.user.wallets, {
             id: wallet
           }).inkey,
           data
         )
         .then(function (response) {
+          self.products = _.reject(self.products, function (obj) {
+            return obj.id == data.id
+          })
           self.products.push(mapProducts(response.data))
-          self.productDialog.show = false
-          self.productDialog.data = {}
+          self.resetDialog('productDialog')
+          //self.productDialog.show = false
+          //self.productDialog.data = {}
         })
         .catch(function (error) {
           LNbits.utils.notifyApiError(error)
         })
     },
+    createProduct: function (data) {
+      let self = this
+      const walletId = _.findWhere(this.stalls, {id: data.stall}).wallet
+      
+      console.log("DATA", walletId, data)
+      LNbits.api
+        .request(
+          'POST',
+          '/diagonalley/api/v1/products',
+          _.findWhere(self.g.user.wallets, {id: walletId}).inkey,
+          data
+        )
+        .then((response) => {
+          console.log(response)
+          self.products.push(mapProducts(response.data))
+          self.resetDialog('productDialog')
+        })
+        .catch((error) => {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
     deleteProduct: function (productId) {
-      var self = this
-      var product = _.findWhere(this.products, {id: productId})
-
+      const product = _.findWhere(this.products, {id: productId})
+      const walletId = _.findWhere(this.stalls, {id: product.stall}).wallet
+      
       LNbits.utils
         .confirmDialog('Are you sure you want to delete this products link?')
-        .onOk(function () {
+        .onOk(() => {
           LNbits.api
             .request(
               'DELETE',
               '/diagonalley/api/v1/products/' + productId,
-              _.findWhere(self.g.user.wallets, {id: product.wallet}).inkey
+              _.findWhere(this.g.user.wallets, {id: walletId}).adminkey
             )
-            .then(function (response) {
-              self.products = _.reject(self.products, function (obj) {
+            .then(() => {
+              this.products = _.reject(this.products, (obj) => {
                 return obj.id == productId
               })
             })
-            .catch(function (error) {
+            .catch((error) => {
               LNbits.utils.notifyApiError(error)
             })
         })
@@ -1368,7 +1378,7 @@ new Vue({
       LNbits.api
         .request(
           'GET',
-          '/diagonalley/api/v1/shops?all_wallets',
+          '/diagonalley/api/v1/shops?all_wallets=true',
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index d5e5e382..4630b321 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -82,7 +82,10 @@ async def api_diagonalley_products(
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
     stalls = [stall.id for stall in await get_diagonalley_stalls(wallet_ids)]
-    
+
+    if not stalls:
+        return
+
     return [product.dict() for product in await get_diagonalley_products(stalls)]
 
 
@@ -93,18 +96,18 @@ async def api_diagonalley_product_create(
 ):
 
     if product_id:
-        product = await get_diagonalley_product(product_id)
-
+        product = await get_diagonalley_product(product_id)        
         if not product:
             return {"message": "Withdraw product does not exist."}
-
-        if product.wallet != wallet.wallet.id:
+        
+        stall = await get_diagonalley_stall(stall_id = product.stall)
+        if stall.wallet != wallet.wallet.id:
             return {"message": "Not your withdraw product."}
 
         product = await update_diagonalley_product(product_id, **data.dict())
     else:
         product = await create_diagonalley_product(data=data)
-
+    print("PRODUCT", product)
     return product.dict()
 
 
@@ -117,7 +120,8 @@ async def api_diagonalley_products_delete(
     if not product:
         return {"message": "Product does not exist."}
 
-    if product.wallet != wallet.wallet.id:
+    stall = await get_diagonalley_stall(product.stall)
+    if stall.wallet != wallet.wallet.id:
         return {"message": "Not your Diagon Alley."}
 
     await delete_diagonalley_product(product_id)
@@ -144,7 +148,7 @@ async def api_diagonalley_zone_create(
 @diagonalley_ext.post("/api/v1/zones/{zone_id}")
 async def api_diagonalley_zone_update(
     data: createZones,
-    zone_id: str = Query(None),
+    zone_id: str,
     wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
     zone = await get_diagonalley_zone(zone_id)
@@ -191,13 +195,13 @@ async def api_diagonalley_stalls(
 @diagonalley_ext.put("/api/v1/stalls/{stall_id}")
 async def api_diagonalley_stall_create(
     data: createStalls,
-    stall_id: str = Query(None),
+    stall_id: str = None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
-
+        print("ID", stall_id)
         if not stall:
             return {"message": "Withdraw stall does not exist."}
 
@@ -213,7 +217,7 @@ async def api_diagonalley_stall_create(
 
 @diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
 async def api_diagonalley_stall_delete(
-    stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
+    stall_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     stall = await get_diagonalley_stall(stall_id)
 
@@ -255,7 +259,7 @@ async def api_diagonalley_order_create(
 
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
 async def api_diagonalley_order_delete(
-    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+    order_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     order = await get_diagonalley_order(order_id)
 
@@ -272,7 +276,7 @@ async def api_diagonalley_order_delete(
 
 @diagonalley_ext.get("/api/v1/orders/paid/{order_id}")
 async def api_diagonalley_order_paid(
-    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(require_admin_key)
+    order_id, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     await db.execute(
         "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
@@ -286,7 +290,7 @@ async def api_diagonalley_order_paid(
 
 @diagonalley_ext.get("/api/v1/orders/shipped/{order_id}")
 async def api_diagonalley_order_shipped(
-    order_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+    order_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     await db.execute(
         "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
@@ -307,7 +311,7 @@ async def api_diagonalley_order_shipped(
 
 @diagonalley_ext.get("/api/v1/stall/products/{stall_id}")
 async def api_diagonalley_stall_products(
-    stall_id: str = Query(None), wallet: WalletTypeInfo = Depends(get_key_type)
+    stall_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
 
     rows = await db.fetchone(

From df780124d7a06124db472b487f256691299514f9 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 15 Jul 2022 10:43:06 +0100
Subject: [PATCH 060/174] rename stall to store

---
 lnbits/extensions/diagonalley/templates/diagonalley/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 7c11f31f..b5c90b76 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -329,7 +329,7 @@
         >
         <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s).')"
           >+ Store
-          <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
+          <q-tooltip> Create a store to list products on </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="shopDialog.show = true"
           >Launch frontend shop (not Nostr)

From b79fb373a82cf0d6068f8c2022db93cac0b79b8e Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 19 Jul 2022 10:12:54 +0100
Subject: [PATCH 061/174] clean prints

---
 lnbits/extensions/diagonalley/crud.py      | 1 -
 lnbits/extensions/diagonalley/views_api.py | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 44864b80..67ef15c9 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -81,7 +81,6 @@ async def get_diagonalley_products(stall_ids: Union[str, List[str]]) -> List[Pro
         """,
         (*stall_ids,),
     )
-    print("PRODS", rows)
     return [Products(**row) for row in rows]
 
 
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 4630b321..c57eeaa3 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -5,8 +5,6 @@ from uuid import uuid4
 from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
-from starlette.exceptions import HTTPException
-
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
 from lnbits.decorators import (
@@ -15,6 +13,7 @@ from lnbits.decorators import (
     require_admin_key,
     require_invoice_key,
 )
+from starlette.exceptions import HTTPException
 
 from . import db, diagonalley_ext
 from .crud import (
@@ -107,7 +106,7 @@ async def api_diagonalley_product_create(
         product = await update_diagonalley_product(product_id, **data.dict())
     else:
         product = await create_diagonalley_product(data=data)
-    print("PRODUCT", product)
+    
     return product.dict()
 
 

From f7f442c9d72f2146cd91774768a02d9cb0c7ab5a Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 19 Jul 2022 10:13:06 +0100
Subject: [PATCH 062/174] add stall page

---
 .../templates/diagonalley/index.html          |  20 ++-
 .../templates/diagonalley/stall.html          | 128 +++++++++++++++++-
 lnbits/extensions/diagonalley/views.py        |  18 +--
 3 files changed, 152 insertions(+), 14 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index b5c90b76..0a56408d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -506,6 +506,7 @@
           {% raw %}
           <template v-slot:header="props">
             <q-tr :props="props">
+              <q-th auto-width></q-th>
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 {{ col.label }}
               </q-th>
@@ -514,6 +515,19 @@
           </template>
           <template v-slot:body="props">
             <q-tr :props="props">
+              <q-td auto-width>
+                <q-btn
+                  unelevated
+                  dense
+                  size="xs"
+                  icon="storefront"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  type="a"
+                  :href="'/diagonalley/' + props.row.id"
+                  target="_blank"
+                ></q-btn>
+                <q-tooltip> Link to pass to stall relay </q-tooltip>
+              </q-td>
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 {{ col.value }}
               </q-td>
@@ -1163,8 +1177,8 @@ new Vue({
       image.src = blobURL
       image.onload = async () => {
         let canvas = document.createElement('canvas')
-        canvas.setAttribute('width', 100)
-        canvas.setAttribute('height', 100)
+        canvas.setAttribute('width', 760)
+        canvas.setAttribute('height', 490)
         await pica.resize(image, canvas, {
           quality: 0,
           alpha: true,
@@ -1493,7 +1507,7 @@ new Vue({
       LNbits.api
         .request(
           'GET',
-          '/diagonalley/api/v1/orders?all_wallets',
+          '/diagonalley/api/v1/orders?all_wallets=true',
           this.g.user.wallets[0].inkey
         )
         .then(function (response) {
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 768bedfe..640a2428 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -1,4 +1,128 @@
-<pre id="json"></pre>
+{% extends "public.html" %} {% block page %}
+<div class="col-lg-10 col-md-10 col-sm-12 col-xs-12">
+  <div class="q-pa-md row items-start q-gutter-md">
+    <template>
+      <q-card class="cursor-pointer" v-for="item in products" :key="item.id">
+        <q-img
+          src="https://miipublications.com.my/wp-content/uploads/2019/10/shop-online-760x490.jpg"
+        ></q-img>
+
+        <q-card-section class="q-pb-xs q-pt-md">
+          <!--<q-btn-->
+          <!--fab-->
+          <!--color="primary"-->
+          <!--icon="shopping_cart"-->
+          <!--class="absolute"-->
+          <!--style="top: 0; right: 12px; transform: translateY(-50%);"-->
+          <!--&gt;</q-btn>-->
+
+          <div class="row no-wrap items-center">
+            <div class="col text-subtitle2 ellipsis-2-lines text-grey-10">
+              Benling C200-BLK Smartwatch (Black Strap Free Size)
+            </div>
+            <div
+              class="col-auto text-grey text-caption q-pt-md row no-wrap items-center"
+            >
+              <!--<q-icon name="place"></q-icon>-->
+              <!--250 ft-->
+            </div>
+          </div>
+
+          <!-- <q-rating v-model="stars" color="orange" :max="5" readonly size="17px"></q-rating> -->
+        </q-card-section>
+
+        <q-card-section class="q-py-sm">
+          <div>
+            <div class="text-caption text-green-8 text-weight-bolder">
+              Special Price
+            </div>
+            <span class="text-h6">₹3,149</span
+            ><span
+              class="q-ml-sm text-grey-6"
+              style="text-decoration: line-through"
+              >₹3,699</span
+            >
+            <span
+              class="q-ml-md text-caption text-green-8 text-weight-bolder q-mt-md"
+              >20% off</span
+            >
+          </div>
+          <!--<div class="text-subtitle1">-->
+          <!--$・Italian, Cafe-->
+          <!--</div>-->
+          <!--<div class="text-caption text-grey">-->
+          <!--Small plates, salads & sandwiches in an intimate setting.-->
+          <!--</div>-->
+        </q-card-section>
+
+        <q-separator></q-separator>
+
+        <q-card-actions>
+          <q-btn
+            flat
+            class="text-weight-bold text-capitalize"
+            dense
+            color="primary"
+          >
+            View details
+          </q-btn>
+        </q-card-actions>
+      </q-card>
+    </template>
+  </div>
+</div>
+<!-- <div class="row q-col-gutter-md">
+  <div class="col-6 col-md-4 col-lg-3" v-for="item in products" :key="item.id">
+    <q-card class="my-card">
+      {% raw %}
+      <q-card-section>
+        <img
+          v-if="item.image"
+          :src="item.image"
+          alt="Product Image"
+          loading="lazy"
+          spinner-color="white"
+          fit="cover"
+        />
+      </q-card-section>
+
+      <q-card-section>
+        <div class="text-h6">{{ item.product }}</div>
+        <div class="text-subtitle2">{{ item.description }}</div>
+      </q-card-section>
+
+      <q-card-section class="q-pt-none"> {{ lorem }} </q-card-section>
+      {% endraw %}
+    </q-card>
+  </div>
+</div> -->
+{% endblock %} {% block scripts %}
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        products: []
+      }
+    },
+    methods: {},
+    created() {
+      this.products = JSON.parse('{{ products | tojson }}')
+      console.log(this.products)
+    }
+  })
+</script>
+{% endblock %}
+<style scoped>
+  .my-card {
+    width: 100%;
+    max-width: 300px;
+  }
+</style>
+
+<!-- <pre id="json"></pre>
 
 <script>
   document.getElementById('json').innerHTML = JSON.stringify(
@@ -6,4 +130,4 @@
     null,
     2
   )
-</script>
+</script> -->
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index c38f8d51..70d5c146 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -3,14 +3,13 @@ from http import HTTPStatus
 from fastapi import Request
 from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
-from starlette.exceptions import HTTPException
-from starlette.responses import HTMLResponse
-
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
 
-from .crud import get_diagonalley_products
+from .crud import get_diagonalley_products, get_diagonalley_stall
 
 templates = Jinja2Templates(directory="templates")
 
@@ -24,17 +23,18 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 @diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
-    product = await get_diagonalley_products(stall_id)
+    stall = await get_diagonalley_stall(stall_id)
+    products = await get_diagonalley_products(stall_id)
 
-    if not product:
+    if not stall:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
         )
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
         {
-            "stall": [
-                product.dict() for product in await get_diagonalley_products(stall_id)
-            ]
+            "request": request,
+            "stall": stall.dict(),
+            "products": [product.dict() for product in products]
         },
     )

From 6965459f5d8860343be25f16c434652425c6d5cb Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 20 Jul 2022 11:46:20 +0100
Subject: [PATCH 063/174] add StaticFiles

---
 lnbits/extensions/diagonalley/__init__.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index db88bdbd..23c02a5f 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -1,18 +1,23 @@
 import asyncio
-from http import HTTPStatus
-
-from fastapi import APIRouter, Request
-from fastapi.staticfiles import StaticFiles
-from starlette.exceptions import HTTPException
-from starlette.responses import HTMLResponse
 
+from fastapi import APIRouter
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
-from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
 from lnbits.tasks import catch_everything_and_restart
+from starlette.staticfiles import StaticFiles
+
+db = Database("ext_diagonalley")
 
 diagonalley_ext: APIRouter = APIRouter(prefix="/diagonalley", tags=["diagonalley"])
-db = Database("ext_diagonalley")
+
+diagonalley_static_files = [
+    {
+        "path": "/diagonalley/static",
+        "app": StaticFiles(directory="lnbits/extensions/diagonalley/static"),
+        "name": "diagonalley_static",
+    }
+]
+
 # if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
 #     @diagonalley_ext.get("/", response_class=HTMLResponse)
 #     async def index(request: Request):
@@ -20,8 +25,10 @@ db = Database("ext_diagonalley")
 #                 "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
 #             )
 # else:
+
 def diagonalley_renderer():
     return template_renderer(["lnbits/extensions/diagonalley/templates"])
+    # return template_renderer(["lnbits/extensions/diagonalley/templates"])
 
 
 from .tasks import wait_for_paid_invoices

From b15134114885f41338157895316e035c3780c64e Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 20 Jul 2022 11:46:48 +0100
Subject: [PATCH 064/174] add a placeholder img for no photo product

---
 .../diagonalley/static/images/placeholder.png    | Bin 0 -> 2840 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lnbits/extensions/diagonalley/static/images/placeholder.png

diff --git a/lnbits/extensions/diagonalley/static/images/placeholder.png b/lnbits/extensions/diagonalley/static/images/placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7d3a94729f5835b922f71f2b57ccdb7c0ca6672
GIT binary patch
literal 2840
zcmeAS@N?(olHy`uVBq!ia0y~yV4lIiz_f{jnSp_!J*+XCfq{V~-O<;Pfnj4m_n$;o
z1_lO&WRD<U28Jp%28M<f28Le@3=9n~7#K<o7#Ln9FfdrnU|<k0n6oR;hJk_6I>0By
z_2c^wZ(hGXapJ_OQ>U(6xpMW&l`EGoU%hhm{o8l%-n_ka^Va>l_fDQXdFITS%a<?T
zym9mXz55UEKX~-;(c_1Y9zJ;Z;QsyFw{D#~ckbG?YcHNX|M2ep>zA)?-@bkN^y#;6
z-aLNv_`><~Cr_Nbee3pv`wyN!efH+n>x&mIT)cSk^{ZDmu3x`=>GHX=XWzblbLaM*
zXHTD<J$v@_sZ(dqoPGc9-IK?UUp{|v{o3`XkDpw)aN*LWOP4NQJb(WDv!_q*-MxGH
z(xs<Qp1gVe=FI8SckkT2cJ<o5d-twhz543K%Xe?zT{wT?+SRK!uHSg}<ms!IFK=AC
ze&^QhmoHwNIeq5(_3Jlp+&F*k{PnBX&YeAX^ZJcbCr>?k@bJ>bOSf*^eDdh=sgox!
zUby(+-u)|=uRMDA@ZQ~fr%#=J{p$6rm#^NwdHep|`-cx6oIP{q|NsBh!RwbZFfcGC
zdAqx0oX+{8#K6G7UgGKN%Kn%~oKs2Q;X9oK1_q9;o-U3d6}R5r{at>!MB>218v(Z*
z*d8xRo+&!v?9Rx!(=9(XiKi^8a8x(a&$0UW>HmLrKg*(oEt!|L{G9f!vd;hh^v$0w
z7v|1#5o8$7z-L#wl<^bE`urA6AAw~Cg3AmXXB={wafl_6OSpyekcb*b@C=UN845m$
zN<N8A2CbYs6OSFA75t<^$7h++nXu|v{|etehG_ul(e#0s1Tm(?u;r$Rnnf~~aLdd0
zy#}oy6ODz_iXLfB=9nzW@%hQ+Z^17nqv{s`*$KC>6QYSjI8Ecsmk9=mO^4=Kmsb5d
zbF=vQ{MvO}1-OOP6wh#XpFG^W`P-$>8x0f-X3TvaZ}IEY&7<DaTR9hVY_<%U@v?jG
zdyk@}%03*W$L2)8`~FH>pHuiy%g$d#|EK4#=M;8o**WjY-nwsd3>N+~2%pR-?8hPe
zitqE(cMCXg8YVjJO)Q(n-X9Supms&-*=pCcJ=3^^vv`UZ-<V*U=+v7Sr(>p489O5&
zdPe@9$O12K5No~I+)vXC7OpdRe0EXrt>Qy1vkuKU&DCESJtH7^hIm*1O(C@_BF|<%
zO1=e>x}#&5?l&XAe}-qL<$Dg{SDc&A%vpV?CF+pR=`)skJ}aL0%$z#o^E!it^9**Y
zKHH=2vqJsMckeTut(?y7k*~f@mFKZ_n_;lc_}SJ+$?G_Tv$!^2*0V{A1=;no-F115
z2scP<V_3<lpGJjCvsW4jKKqb(j8*^C>9EsBz7}rR^l6EFIM05*i1en&S0WX*QJ$@x
z2JQUDdL_M%Vec+FoesPrqIPIaLHy0IiKjo=>0Z4i-R`cl?2yZh!|gNA@yl(Dc&B{x
z^8b0s`5eNDeDZ0^azA=nmORN{^1u3EZlcl|u0%5{=6A^-Zk{d5jIH{x?Q1bquzTn8
z)849=e?2-_=)KZFFs;=<dhQ%{)tvk(zOSz}GjE<|Aec7QK>B5Ot=_D&=cd}dU;00O
z^9C7i;lwb`%@-r~UVXiF|DJ$-Yu3xj-37T&EN$_|57#c{n{1ChyvO%WT}6$#sM?`5
z5^0MKzkmG{^l8Dll&7<Q&UW7GUh}1K_VJcZ1MT+87vHSI^J{jO{k`()*oN?THQ!Hs
z@J&=Y6W9_Nx##N(cX#uaP6KttGdqtT%jXtO^mCeVT|WL@n}OgnmX^vV(bGTeKP{pb
zESYAUF=Kmw-P21VYKM60j@cBJ?EW4vu6Bq=_Sxj=hs|3%4Vc?^ety#Hb!y*f5w$}y
zTi;i`xeih*owi>4AxQpk+s)T{TW>x;<T69?@SlCpn`VPqZ;C%JSY{xYw!`54mzx`|
zux~!(GGp;q=l!DooWhB1T%X^C?H4T%PE<PMkht&Ccg-Ez+d+1<{w(`1TMsf{<XPB%
z+4UU4iEW&lCx5=N;mJA!!L$hm^{1jYsrs}?s+_swF8o)=r$tifjJ4;zNq74U1k)M}
z{GaPZ{_!eHR629fGyiG+PHmr-$od)kRenaV;}A}~CjacKWA;5^waqeV3vP$&@kM=J
zWKei)jrEz<gVkj%od&OYjP3Sam)-MxpMhXnZsM}n`|GagZF&x}+BWgtzVFf7U(E9^
zKIAgvG5_a;+Wg&T7F}=YG&nB%>|9=0(M8)tr89+XmF4yMEB`FI8#05VI3{t~@7?>i
zx8Ev>pTSYAlUSA~_J7NBPJ3?Q#6G(-&8w@wug>}9uH(~U`N$yu-M^Wkx3^r#-`~<{
z;9X<9$)qW?ytUK7UG&-AYcqe}^a#`aw1y>7=}e>EaqG_~UzF`t_i2f=Jk$L3=hBJq
zs{CefY)+bCoqqe~is`ljYKPW{JX@K<bNU@P(G}~&x}~>v8fdpz&eL1`Tl$d84Ci*s
zWqOM<VrOs^-!M3SEw#jL21oG;gX7nqKDb}UDV%ui-qQ#FPjd+;Ub~;VMb)Rp(q+cu
zw?<j=9Kwn7=4{YgyhhchrLySIuAW7APakrbG5K2RmEP7)1NF719ryngQai+R@oB?v
z2~hmKFghg$N{eexAMO>0F#Z^|b{ZTmnHddAAq(_Ap901B)l|Qkhg@bH-1R0NB)miK
z_cTqP7Re2#>r%Od6WiWw@&`#f?tT*slD?r=4VK<<Iu0!TZj<}WLn&g1{%D^Q-gEl!
z*K)b|m->lD%!z5+KdA_B_%GkTehMe3@YYm^mi4H$2CN2vi?(#~eZJ*o<QjHQR4rIA
zEjfACpSuETmj$1N2&-YKVIXx6k|~O7-Yu29^z}R2aIT0M7-n$&XRvdef9(JKpJ@yX
z45}rr5hW>!C8<`)MX8A;sSHL2hL*a9M!H7EAqJLK#wJ#VX4(b@Rt5$Qm;dfU(U6;;
zl9^VCTf@gbS5R0=f@}!RPb(=;EJ|f?Ovz75Rq)JBOiv9;O-!jQJeg_(3UE(XKbLh*
G2~7YIWw#>$

literal 0
HcmV?d00001


From e56b26146ad8bb583951b4869a7d99bcf3f35b5e Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 20 Jul 2022 11:47:03 +0100
Subject: [PATCH 065/174] toolbar

---
 .../templates/diagonalley/stall.html          | 208 ++++++++++--------
 1 file changed, 114 insertions(+), 94 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 640a2428..a7a4ddca 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -1,101 +1,116 @@
 {% extends "public.html" %} {% block page %}
-<div class="col-lg-10 col-md-10 col-sm-12 col-xs-12">
-  <div class="q-pa-md row items-start q-gutter-md">
-    <template>
-      <q-card class="cursor-pointer" v-for="item in products" :key="item.id">
-        <q-img
-          src="https://miipublications.com.my/wp-content/uploads/2019/10/shop-online-760x490.jpg"
-        ></q-img>
-
-        <q-card-section class="q-pb-xs q-pt-md">
-          <!--<q-btn-->
-          <!--fab-->
-          <!--color="primary"-->
-          <!--icon="shopping_cart"-->
-          <!--class="absolute"-->
-          <!--style="top: 0; right: 12px; transform: translateY(-50%);"-->
-          <!--&gt;</q-btn>-->
-
-          <div class="row no-wrap items-center">
-            <div class="col text-subtitle2 ellipsis-2-lines text-grey-10">
-              Benling C200-BLK Smartwatch (Black Strap Free Size)
-            </div>
-            <div
-              class="col-auto text-grey text-caption q-pt-md row no-wrap items-center"
-            >
-              <!--<q-icon name="place"></q-icon>-->
-              <!--250 ft-->
-            </div>
-          </div>
-
-          <!-- <q-rating v-model="stars" color="orange" :max="5" readonly size="17px"></q-rating> -->
-        </q-card-section>
-
-        <q-card-section class="q-py-sm">
-          <div>
-            <div class="text-caption text-green-8 text-weight-bolder">
-              Special Price
-            </div>
-            <span class="text-h6">₹3,149</span
-            ><span
-              class="q-ml-sm text-grey-6"
-              style="text-decoration: line-through"
-              >₹3,699</span
-            >
-            <span
-              class="q-ml-md text-caption text-green-8 text-weight-bolder q-mt-md"
-              >20% off</span
-            >
-          </div>
-          <!--<div class="text-subtitle1">-->
-          <!--$・Italian, Cafe-->
-          <!--</div>-->
-          <!--<div class="text-caption text-grey">-->
-          <!--Small plates, salads & sandwiches in an intimate setting.-->
-          <!--</div>-->
-        </q-card-section>
-
-        <q-separator></q-separator>
-
-        <q-card-actions>
-          <q-btn
-            flat
-            class="text-weight-bold text-capitalize"
-            dense
-            color="primary"
-          >
-            View details
-          </q-btn>
-        </q-card-actions>
-      </q-card>
-    </template>
+<div class="row q-mb-md">
+  <div class="col-12 q-gutter-y-md">
+    <q-toolbar class="row">
+      <div class="col">
+        <q-toolbar-title> {{ stall.name }} </q-toolbar-title>
+      </div>
+      <div class="col q-mx-md">
+        <q-input
+          class="float-left full-width q-ml-md"
+          standout
+          square
+          dense
+          outlined
+          clearable
+          v-model.trim="searchText"
+          label="Search for products"
+        >
+          <template v-slot:append>
+            <q-icon v-if="!searchText" name="search" />
+          </template>
+        </q-input>
+      </div>
+      <q-btn class="q-ml-auto" flat icon="shopping_cart" />
+    </q-toolbar>
   </div>
 </div>
-<!-- <div class="row q-col-gutter-md">
-  <div class="col-6 col-md-4 col-lg-3" v-for="item in products" :key="item.id">
-    <q-card class="my-card">
+<div class="row q-col-gutter-md">
+  <div
+    class="col-xs-12 col-sm-6 col-lg-4"
+    v-for="item in products"
+    :key="item.id"
+  >
+    <q-card class="card--product">
       {% raw %}
-      <q-card-section>
-        <img
-          v-if="item.image"
-          :src="item.image"
-          alt="Product Image"
-          loading="lazy"
-          spinner-color="white"
-          fit="cover"
-        />
+      <q-img
+        :src="item.image ? item.image : '/diagonalley/static/images/placeholder.png'"
+        alt="Product Image"
+        loading="lazy"
+        spinner-color="white"
+        fit="cover"
+        height="300px"
+      ></q-img>
+
+      <q-card-section class="q-pb-xs q-pt-md">
+        <q-btn
+          round
+          color="primary"
+          icon="shopping_cart"
+          size="lg"
+          style="
+            position: absolute;
+            top: 0;
+            right: 0;
+            transform: translate(-50%, -50%);
+          "
+          @click="sendAlert"
+          ><q-tooltip> Add to cart </q-tooltip></q-btn
+        >
+
+        <div class="row no-wrap items-center">
+          <div class="col text-subtitle2 ellipsis-2-lines">
+            {{ item.product }}
+          </div>
+        </div>
+
+        <!-- <q-rating v-model="stars" color="orange" :max="5" readonly size="17px"></q-rating> -->
       </q-card-section>
 
-      <q-card-section>
-        <div class="text-h6">{{ item.product }}</div>
-        <div class="text-subtitle2">{{ item.description }}</div>
+      <q-card-section class="q-py-sm">
+        <div>
+          <div class="text-caption text-green-8 text-weight-bolder">
+            Special Price
+          </div>
+          <span class="text-h6">{{ item.price }} sats</span
+          ><span class="q-ml-sm text-grey-6"
+            >BTC {{ (item.price / 1e8).toFixed(8) }}</span
+          >
+          <span
+            class="q-ml-md text-caption text-green-8 text-weight-bolder q-mt-md"
+            >{{item.quantity}} left</span
+          >
+        </div>
+        <div v-if="item.categories" class="text-subtitle1">
+          <q-chip v-for="cat in item.categories.split(',')" dense
+            >{{cat}}</q-chip
+          >
+        </div>
+        <div
+          v-if="item.description"
+          class="text-caption text-grey ellipsis-2-lines"
+          style="min-height: 40px"
+        >
+          {{ item.description }}
+        </div>
       </q-card-section>
 
-      <q-card-section class="q-pt-none"> {{ lorem }} </q-card-section>
+      <q-separator></q-separator>
+
+      <q-card-actions>
+        <q-btn
+          flat
+          class="text-weight-bold text-capitalize"
+          dense
+          color="primary"
+        >
+          View details
+        </q-btn>
+      </q-card-actions>
       {% endraw %}
     </q-card>
   </div>
-</div> -->
+</div>
 {% endblock %} {% block scripts %}
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
@@ -104,23 +119,28 @@
     mixins: [windowMixin],
     data: function () {
       return {
-        products: []
+        products: [],
+        searchText: null,
+        cart: []
+      }
+    },
+    methods: {
+      sendAlert() {
+        alert('really')
       }
     },
-    methods: {},
     created() {
       this.products = JSON.parse('{{ products | tojson }}')
-      console.log(this.products)
+      console.log(this.searchText)
     }
   })
 </script>
-{% endblock %}
 <style scoped>
-  .my-card {
-    width: 100%;
-    max-width: 300px;
+  .card--product {
+    background: pink;
   }
 </style>
+{% endblock %}
 
 <!-- <pre id="json"></pre>
 

From 245e2a353e386ece7d799e75574fc7af25478b46 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 20 Jul 2022 17:00:24 +0100
Subject: [PATCH 066/174] add cart menu and filter products

---
 .../templates/diagonalley/stall.html          | 95 +++++++++++++++++--
 1 file changed, 88 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index a7a4ddca..5c585fd3 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -21,14 +21,56 @@
           </template>
         </q-input>
       </div>
-      <q-btn class="q-ml-auto" flat icon="shopping_cart" />
+      <q-btn dense round flat icon="shopping_cart">
+        {% raw %}
+        <q-badge v-if="cart.size" color="red" class="text-bold" floating>
+          {{ cart.size }}
+        </q-badge>
+        {% endraw %}
+        <q-menu auto-close v-if="cart.size">
+          <q-list style="min-width: 100px">
+            {% raw %}
+            <q-item clickable :key="p.id" v-for="p in cartMenu">
+              <q-item-section side>
+                <span>{{p.quantity}} x </span>
+              </q-item-section>
+              <q-item-section avatar>
+                <q-avatar color="primary">
+                  <img
+                    size="sm"
+                    :src="products.find(f => f.id == p.id).image"
+                  />
+                </q-avatar>
+              </q-item-section>
+
+              <q-item-section>
+                <q-item-label>{{ p.name }}</q-item-label>
+              </q-item-section>
+
+              <q-item-section side>
+                <span> {{p.price}} sats</span>
+              </q-item-section>
+            </q-item>
+            {% endraw %}
+            <q-separator />
+          </q-list>
+          <div class="q-pa-md q-gutter-md">
+            <q-btn
+              color="primary"
+              icon-right="checkout"
+              label="Checkout"
+              @click="placeOrder"
+            />
+          </div>
+        </q-menu>
+      </q-btn>
     </q-toolbar>
   </div>
 </div>
 <div class="row q-col-gutter-md">
   <div
     class="col-xs-12 col-sm-6 col-lg-4"
-    v-for="item in products"
+    v-for="item in filterProducts"
     :key="item.id"
   >
     <q-card class="card--product">
@@ -54,7 +96,7 @@
             right: 0;
             transform: translate(-50%, -50%);
           "
-          @click="sendAlert"
+          @click="addToCart(item)"
           ><q-tooltip> Add to cart </q-tooltip></q-btn
         >
 
@@ -121,17 +163,56 @@
       return {
         products: [],
         searchText: null,
-        cart: []
+        cart: {
+          total: 0,
+          size: 0,
+          products: new Map()
+        },
+        cartMenu: []
+      }
+    },
+    computed: {
+      filterProducts() {
+        if (!this.searchText || this.searchText.length < 2) return this.products
+        return this.products.filter(p => {
+          return (
+            p.product.includes(this.searchText) ||
+            p.description.includes(this.searchText) ||
+            p.categories.includes(this.searchText)
+          )
+        })
       }
     },
     methods: {
-      sendAlert() {
-        alert('really')
+      addToCart(item) {
+        let prod = this.cart.products
+        if (prod.has(item.id)) {
+          let qty = prod.get(item.id).quantity
+          prod.set(item.id, {
+            ...prod.get(item.id),
+            quantity: qty + 1
+          })
+        } else {
+          prod.set(item.id, {
+            name: item.product,
+            quantity: 1,
+            price: item.price
+          })
+        }
+        this.cart.total += item.price
+        this.cart.size++
+        this.cart.products = prod
+        this.cartMenu = Array.from(prod, item => {
+          return {id: item[0], ...item[1]}
+        })
+        console.log(this.cartMenu)
       }
     },
+    placeOrder() {
+      return
+    },
     created() {
       this.products = JSON.parse('{{ products | tojson }}')
-      console.log(this.searchText)
     }
   })
 </script>

From 0f238286a33287da99553cbe1f400c416443fa79 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 25 Jul 2022 10:11:03 +0100
Subject: [PATCH 067/174] add order_details table

---
 lnbits/extensions/diagonalley/migrations.py   |  57 ++++++----
 .../templates/diagonalley/stall.html          | 104 ++++++++++++++++--
 2 files changed, 129 insertions(+), 32 deletions(-)

diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 2500dbb0..0ad308b8 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -1,22 +1,4 @@
 async def m001_initial(db):
-    """
-    Initial products table.
-    """
-    await db.execute(
-        """
-        CREATE TABLE diagonalley.products (
-            id TEXT PRIMARY KEY,
-            stall TEXT NOT NULL,
-            product TEXT NOT NULL,
-            categories TEXT,
-            description TEXT,
-            image TEXT,
-            price INTEGER NOT NULL,
-            quantity INTEGER NOT NULL
-        );
-    """
-    )
-
     """
     Initial stalls table.
     """
@@ -34,6 +16,25 @@ async def m001_initial(db):
     """
     )
 
+    """
+    Initial products table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.products (
+            id TEXT PRIMARY KEY,
+            stall TEXT NOT NULL REFERENCES {db.references_schema}stalls (id),
+            product TEXT NOT NULL,
+            categories TEXT,
+            description TEXT,
+            image TEXT,
+            price INTEGER NOT NULL,
+            quantity INTEGER NOT NULL,
+            rating INTEGER NOT NULL
+        );
+    """
+    )
+
     """
     Initial zones table.
     """
@@ -54,12 +55,10 @@ async def m001_initial(db):
     await db.execute(
         """
         CREATE TABLE diagonalley.orders (
-            id TEXT PRIMARY KEY,
+            id {db.serial_primary_key},
             productid TEXT NOT NULL,
             usr TEXT NOT NULL,
             pubkey TEXT NOT NULL,
-            product TEXT NOT NULL,
-            quantity INTEGER NOT NULL,
             shippingzone INTEGER NOT NULL,
             address TEXT NOT NULL,
             email TEXT NOT NULL,
@@ -72,3 +71,19 @@ async def m001_initial(db):
         );
     """
     )
+
+    """
+    Initial order details table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.order_details (
+            id TEXT PRIMARY KEY,
+            orderid INTEGER NOT NULL REFERENCES {db.references_schema}orders (id)
+            productid TEXT NOT NULL REFERENCES {db.references_schema}products (id),
+            quantity INTEGER NOT NULL,
+            total INTEGER NOT NULL 
+        );
+    """
+    )
+    
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 5c585fd3..226ecd2b 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -59,7 +59,7 @@
               color="primary"
               icon-right="checkout"
               label="Checkout"
-              @click="placeOrder"
+              @click="checkoutDialog.show = true"
             />
           </div>
         </q-menu>
@@ -69,7 +69,7 @@
 </div>
 <div class="row q-col-gutter-md">
   <div
-    class="col-xs-12 col-sm-6 col-lg-4"
+    class="col-xs-12 col-sm-6 col-md-4 col-lg-3"
     v-for="item in filterProducts"
     :key="item.id"
   >
@@ -87,6 +87,7 @@
       <q-card-section class="q-pb-xs q-pt-md">
         <q-btn
           round
+          :disabled="item.quantity < 1"
           color="primary"
           icon="shopping_cart"
           size="lg"
@@ -112,7 +113,7 @@
       <q-card-section class="q-py-sm">
         <div>
           <div class="text-caption text-green-8 text-weight-bolder">
-            Special Price
+            {{ item.stall }}
           </div>
           <span class="text-h6">{{ item.price }} sats</span
           ><span class="q-ml-sm text-grey-6"
@@ -152,6 +153,68 @@
       {% endraw %}
     </q-card>
   </div>
+  <!-- CHECKOUT DIALOG -->
+  <q-dialog v-model="checkoutDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+      <q-form @submit="placeOrder" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="checkoutDialog.data.username"
+          label="Name *optional"
+        ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.trim="checkoutDialog.data.address_1"
+          label="Address (line 1)"
+        ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.trim="checkoutDialog.data.address_2"
+          label="Address (line 2)"
+        ></q-input>
+        <q-input
+          v-model="checkoutDialog.data.email"
+          filled
+          dense
+          type="email"
+          label="Email"
+        />
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="checkoutDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Product</q-btn
+          >
+
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="checkoutDialog.data.price == null
+              || checkoutDialog.data.product == null
+              || checkoutDialog.data.description == null
+              || checkoutDialog.data.quantity == null"
+            type="submit"
+            >Create Product</q-btn
+          >
+
+          <q-btn
+            v-close-popup
+            flat
+            @click="checkoutDialog = {show: false, data: {}}"
+            color="grey"
+            class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
 </div>
 {% endblock %} {% block scripts %}
 <script>
@@ -168,7 +231,11 @@
           size: 0,
           products: new Map()
         },
-        cartMenu: []
+        cartMenu: [],
+        checkoutDialog: {
+          show: false,
+          data: {}
+        }
       }
     },
     computed: {
@@ -199,26 +266,41 @@
             price: item.price
           })
         }
-        this.cart.total += item.price
-        this.cart.size++
         this.cart.products = prod
-        this.cartMenu = Array.from(prod, item => {
+        this.updateCart(item.price)
+      },
+      removeFromCart() {},
+      updateCart(price) {
+        this.cart.total += price
+        this.cart.size++
+        this.cartMenu = Array.from(this.cart.products, item => {
           return {id: item[0], ...item[1]}
         })
         console.log(this.cartMenu)
+      },
+      placeOrder() {
+        // productid: str = Query(...)
+        // stall: str = Query(...)
+        // product: str = Query(...)
+        // quantity: int = Query(..., ge=1)
+        // shippingzone: int = Query(...)
+        // address: str = Query(...)
+        // email: str = Query(...)
+        // invoiceid: str = Query(...)
+        return
       }
     },
-    placeOrder() {
-      return
-    },
     created() {
       this.products = JSON.parse('{{ products | tojson }}')
+      let stall_ids = new Set()
+      this.products.map(p => stall_ids.add(p.stall))
+
+      console.log(stall_ids)
     }
   })
 </script>
 <style scoped>
   .card--product {
-    background: pink;
   }
 </style>
 {% endblock %}

From 6d5e9aba39d2e3ecc93219859bc01172a51efb66 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 27 Jul 2022 15:28:58 +0100
Subject: [PATCH 068/174] initial launch market

---
 lnbits/extensions/diagonalley/crud.py         | 25 ++++++++++++
 lnbits/extensions/diagonalley/migrations.py   | 26 +++++++++++++
 lnbits/extensions/diagonalley/models.py       | 12 +++++-
 .../templates/diagonalley/index.html          | 18 ++++-----
 lnbits/extensions/diagonalley/views.py        | 18 +++++++++
 lnbits/extensions/diagonalley/views_api.py    | 39 +++++++++++++++++++
 6 files changed, 127 insertions(+), 11 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 67ef15c9..fbc1d332 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -12,6 +12,7 @@ from lnbits.settings import WALLET
 
 from . import db
 from .models import (
+    Market,
     Orders,
     Products,
     Stalls,
@@ -261,3 +262,27 @@ async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orde
 
 async def delete_diagonalley_order(order_id: str) -> None:
     await db.execute("DELETE FROM diagonalley.orders WHERE id = ?", (order_id,))
+
+### Market/Marketplace
+
+async def get_diagonalley_markets(user: str) -> List[Market]:
+    rows = await db.fetchall(
+        'SELECT * FROM diagonalley.markets WHERE usr = ?', (user,)
+    )
+    return [Market(**row) for row in rows]
+
+
+async def get_diagonalley_market(market_id: str) -> Optional[Market]:
+    row = await db.fetchone(
+        'SELECT * FROM diagonalley.markets WHERE id = ?', (market_id,)
+    )
+    Market(**row) if row else None
+
+
+async def get_diagonalley_market_stalls(market_id: str):
+    rows = await db.fetchall(
+        "SELECT * FROM diagonalley.market_stalls WHERE marketid = ?", (market_id,)
+    )
+    return [Stalls(**row) for row in rows]
+
+
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 0ad308b8..e994d723 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -86,4 +86,30 @@ async def m001_initial(db):
         );
     """
     )
+
+    """
+    Initial market table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.markets (
+            id TEXT PRIMARY KEY,
+            usr TEXT NOT NULL,
+            name TEXT
+        );
+    """
+    )
+
+    """
+    Initial market stalls table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE diagonalley.market_stalls (
+            id TEXT PRIMARY KEY,
+            marketid TEXT NOT NULL REFERENCES {db.references_schema}markets (id),
+            stallid TEXT NOT NULL REFERENCES {db.references_schema}stalls (id)
+        );
+    """
+    )
     
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 2132d72f..4fbf04ff 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import List, Optional
 
 from fastapi.param_functions import Query
 from pydantic import BaseModel
@@ -81,3 +81,13 @@ class Orders(BaseModel):
     paid: bool
     shipped: bool
     time: int
+
+class CreateMarket(BaseModel):
+    usr: str = Query(...)
+    name: str = Query(None)
+    stalls: List[str] = Query(...)
+
+class Market(BaseModel):
+    id: str
+    usr: str
+    name: Optional[str]
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 0a56408d..dbe443eb 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -816,7 +816,7 @@ new Vue({
           {
             name: 'stall',
             align: 'left',
-            label: 'Stall',
+            label: 'Store',
             field: 'stall'
           },
           {
@@ -1384,23 +1384,21 @@ new Vue({
       LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
     },
     ////////////////////////////////////////
-    //////////////////SHOP//////////////////
+    //////////////////MARKET//////////////////
     ////////////////////////////////////////
-    getShops: function () {
-      var self = this
-
+    getMarkets(){
       LNbits.api
         .request(
           'GET',
-          '/diagonalley/api/v1/shops?all_wallets=true',
+          '/diagonalley/api/v1/markets',
           this.g.user.wallets[0].inkey
         )
-        .then(function (response) {
+        .then((response) => {
           if (response.data) {
-            self.shops = response.data.map(mapShops)
+            this.shops = response.data.map(mapShops)
           }
         })
-        .catch(function (error) {
+        .catch((error) => {
             LNbits.utils.notifyApiError(error)
           })
     },
@@ -1451,7 +1449,6 @@ new Vue({
         })
     },
     createShop: function (data) {
-      var self = this
       console.log('cuntywoo')
       LNbits.api
         .request(
@@ -1591,6 +1588,7 @@ new Vue({
       this.getProducts()
       this.getZones()
       this.getOrders()
+      this.getMarkets()
       this.customerKeys = [
         'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
         'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 70d5c146..2ec75589 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -38,3 +38,21 @@ async def display(request: Request, stall_id):
             "products": [product.dict() for product in products]
         },
     )
+
+@diagonalley_ext.get("/{market_id}", response_class=HTMLResponse)
+async def display(request: Request, stall_id):
+    stalls = await get_diagonalley_stall(stall_id)
+    products = await get_diagonalley_products(stall_id)
+
+    if not stall:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
+        )
+    return diagonalley_renderer().TemplateResponse(
+        "diagonalley/stall.html",
+        {
+            "request": request,
+            "stall": stall.dict(),
+            "products": [product.dict() for product in products]
+        },
+    )
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index c57eeaa3..b2fb5a47 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -25,6 +25,8 @@ from .crud import (
     delete_diagonalley_product,
     delete_diagonalley_stall,
     delete_diagonalley_zone,
+    get_diagonalley_market,
+    get_diagonalley_markets,
     get_diagonalley_order,
     get_diagonalley_orders,
     get_diagonalley_product,
@@ -38,6 +40,7 @@ from .crud import (
     update_diagonalley_zone,
 )
 from .models import (
+    CreateMarket,
     Orders,
     Products,
     Stalls,
@@ -383,3 +386,39 @@ async def api_diagonalley_stall_order(
         ),
     )
     return {"checking_id": checking_id, "payment_request": payment_request}
+
+
+##
+# MARKETS
+##
+
+@diagonalley_ext.get("/api/v1/markets")
+async def api_diagonalley_orders(
+    wallet: WalletTypeInfo = Depends(get_key_type)
+):
+    try:
+        return [market.dict() for market in await get_diagonalley_markets(wallet.wallet.user)]
+    except:
+        return {"message": "We could not retrieve the markets."}
+
+@diagonalley_ext.post("/api/v1/markets")
+@diagonalley_ext.put("/api/v1/markets/{market_id}")
+async def api_diagonalley_stall_create(
+    data: CreateMarket,
+    market_id: str = None,
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
+):
+
+    if market_id:
+        market = await get_diagonalley_market(market_id)
+        if not market:
+            return {"message": "Market does not exist."}
+
+        if market.usr != wallet.wallet.user:
+            return {"message": "Not your market."}
+
+        market = await update_diagonalley_market(market_id, **data.dict())
+    else:
+        market = await create_diagonalley_market(data=data)
+
+    return market.dict()

From 3f58676849ef28b03c9ef05ac0537010e6d7b8f9 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 27 Jul 2022 16:46:27 +0100
Subject: [PATCH 069/174] rename shop to market and create market

---
 .../templates/diagonalley/index.html          | 52 +++++++++----------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index dbe443eb..893830a9 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -170,13 +170,13 @@
     </q-card>
   </q-dialog>
   <!-- SHOP DIALOG -->
-  <q-dialog v-model="shopDialog.show" position="top">
+  <q-dialog v-model="marketDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendShopFormData" class="q-gutter-md">
         <q-toggle
         label="Activate shop"
         color="primary"
-        v-model="shopDialog.data.activate"
+        v-model="marketDialog.data.activate"
       ></q-toggle>
         <q-select
           filled
@@ -185,11 +185,11 @@
           emit-value
           :options="stalls.map(s => ({label: s.name, value: s.id}))"
           label="Stalls"
-          v-model.trim="shopDialog.data.stalls"
+          v-model.trim="marketDialog.data.stalls"
         ></q-select>
         <div class="row q-mt-lg">
           <q-btn
-            v-if="shopDialog.data.id"
+            v-if="marketDialog.data.id"
             unelevated
             color="primary"
             type="submit"
@@ -199,13 +199,13 @@
             v-else
             unelevated
             color="primary"
-            :disable="shopDialog.data.activate == null
-              || shopDialog.data.stalls == null"
+            :disable="marketDialog.data.activate == null
+              || marketDialog.data.stalls == null"
             type="submit"
             >Launch</q-btn
           >
 
-          <q-btn v-close-popup flat @click="resetDialog('shopDialog')" color="grey" class="q-ml-auto"
+          <q-btn v-close-popup flat @click="resetDialog('marketDialog')" color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
@@ -924,7 +924,7 @@ new Vue({
         show: false,
         data: {countries:[]}
       },
-      shopDialog: {
+      marketDialog: {
         show: false,
         data: {activate: false}
       },
@@ -1410,16 +1410,14 @@ new Vue({
       this.shopDialog.show = true
     },
     sendShopFormData: function () {
-      if (this.shopDialog.data.id) {
-      } else {
-        var data = {
-          countries: this.shopDialog.data.countries,
-          cost: this.shopDialog.data.cost
-        }
-      }
+      let data = {...this.marketDialog.data}
 
-      if (this.shopDialog.data.id) {
-        this.updateZone(this.shopDialog.data)
+      if(!data.usr) {
+        data.usr = this.g.user.id
+      }
+      
+      if (data.id) {
+        this.updateZone(data)
       } else {
         this.createZone(data)
       }
@@ -1448,24 +1446,22 @@ new Vue({
           LNbits.utils.notifyApiError(error)
         })
     },
-    createShop: function (data) {
-      console.log('cuntywoo')
+    createShop(data) {
+      console.log('data')
       LNbits.api
         .request(
           'POST',
-          '/diagonalley/api/v1/shops',
-          _.findWhere(self.g.user.wallets, {
-            id: self.shopDialog.data.wallet
-          }).inkey,
+          '/diagonalley/api/v1/markets',
+          this.g.user.wallets[0].inkey,
           data
         )
-        .then(function (response) {
-          self.shops.push(mapShops(response.data))
-          self.shopDialog.show = false
-          self.shopDialog.data = {}
+        .then((response) => {
+          this.shops.push(mapShops(response.data))
+          this.shopDialog.show = false
+          this.shopDialog.data = {}
           data = {}
         })
-        .catch(function (error) {
+        .catch((error) => {
           LNbits.utils.notifyApiError(error)
         })
     },

From c4509d726aef79e772f4e773fc2c920f067149e5 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 16 Aug 2022 12:07:04 +0100
Subject: [PATCH 070/174] UI and checkout

---
 coverage.xml | 13560 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 13560 insertions(+)
 create mode 100644 coverage.xml

diff --git a/coverage.xml b/coverage.xml
new file mode 100644
index 00000000..dd7ec7b1
--- /dev/null
+++ b/coverage.xml
@@ -0,0 +1,13560 @@
+<?xml version="1.0" ?>
+<coverage version="6.4.3" timestamp="1660296690320" lines-valid="12273" lines-covered="4905" line-rate="0.3997" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+	<!-- Generated by coverage.py: https://coverage.readthedocs.io -->
+	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
+	<sources>
+		<source>/home/tvasconcelos/Work/lnbits/lnbits</source>
+	</sources>
+	<packages>
+		<package name="." line-rate="0.6764" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
+				<class name="__main__.py" filename="__main__.py" complexity="0" line-rate="0" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="0"/>
+						<line number="3" hits="0"/>
+						<line number="4" hits="0"/>
+						<line number="5" hits="0"/>
+						<line number="7" hits="0"/>
+						<line number="8" hits="0"/>
+						<line number="19" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+					</lines>
+				</class>
+				<class name="app.py" filename="app.py" complexity="0" line-rate="0.7045" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="0"/>
+						<line number="84" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="119" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="125" hits="1"/>
+						<line number="126" hits="1"/>
+						<line number="127" hits="1"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="1"/>
+						<line number="131" hits="1"/>
+						<line number="133" hits="1"/>
+						<line number="134" hits="1"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="1"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="1"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="147" hits="1"/>
+						<line number="150" hits="1"/>
+						<line number="151" hits="1"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="160" hits="1"/>
+						<line number="161" hits="1"/>
+						<line number="162" hits="1"/>
+						<line number="163" hits="0"/>
+						<line number="165" hits="1"/>
+						<line number="166" hits="1"/>
+						<line number="167" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="171" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="174" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="176" hits="0"/>
+						<line number="179" hits="1"/>
+						<line number="180" hits="1"/>
+						<line number="181" hits="1"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="186" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="193" hits="0"/>
+						<line number="199" hits="1"/>
+						<line number="200" hits="1"/>
+						<line number="201" hits="1"/>
+						<line number="202" hits="1"/>
+						<line number="203" hits="1"/>
+						<line number="205" hits="1"/>
+						<line number="206" hits="1"/>
+						<line number="209" hits="1"/>
+						<line number="210" hits="1"/>
+						<line number="211" hits="1"/>
+						<line number="212" hits="1"/>
+						<line number="213" hits="1"/>
+						<line number="214" hits="1"/>
+						<line number="216" hits="0"/>
+						<line number="218" hits="1"/>
+						<line number="219" hits="1"/>
+						<line number="220" hits="1"/>
+						<line number="221" hits="0"/>
+						<line number="222" hits="1"/>
+						<line number="225" hits="1"/>
+						<line number="226" hits="1"/>
+						<line number="227" hits="0"/>
+						<line number="228" hits="0"/>
+						<line number="229" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="231" hits="0"/>
+					</lines>
+				</class>
+				<class name="bolt11.py" filename="bolt11.py" complexity="0" line-rate="0.7857" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="0"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="1"/>
+						<line number="110" hits="1"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="114" hits="1"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="126" hits="1"/>
+						<line number="127" hits="1"/>
+						<line number="128" hits="1"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="1"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="1"/>
+						<line number="134" hits="1"/>
+						<line number="136" hits="1"/>
+						<line number="137" hits="1"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="1"/>
+						<line number="140" hits="1"/>
+						<line number="141" hits="0"/>
+						<line number="143" hits="1"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="1"/>
+						<line number="146" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="162" hits="1"/>
+						<line number="165" hits="1"/>
+						<line number="166" hits="1"/>
+						<line number="167" hits="1"/>
+						<line number="169" hits="1"/>
+						<line number="170" hits="0"/>
+						<line number="174" hits="1"/>
+						<line number="176" hits="0"/>
+						<line number="178" hits="1"/>
+						<line number="181" hits="1"/>
+						<line number="184" hits="1"/>
+						<line number="185" hits="1"/>
+						<line number="187" hits="1"/>
+						<line number="192" hits="1"/>
+						<line number="193" hits="1"/>
+						<line number="194" hits="0"/>
+						<line number="196" hits="1"/>
+						<line number="197" hits="0"/>
+						<line number="198" hits="0"/>
+						<line number="199" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="207" hits="0"/>
+						<line number="208" hits="1"/>
+						<line number="209" hits="0"/>
+						<line number="210" hits="1"/>
+						<line number="211" hits="1"/>
+						<line number="212" hits="1"/>
+						<line number="214" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="216" hits="0"/>
+						<line number="217" hits="0"/>
+						<line number="218" hits="1"/>
+						<line number="219" hits="1"/>
+						<line number="220" hits="0"/>
+						<line number="221" hits="0"/>
+						<line number="224" hits="0"/>
+						<line number="226" hits="1"/>
+						<line number="232" hits="1"/>
+						<line number="233" hits="0"/>
+						<line number="234" hits="1"/>
+						<line number="235" hits="0"/>
+						<line number="238" hits="1"/>
+						<line number="239" hits="1"/>
+						<line number="243" hits="1"/>
+						<line number="244" hits="1"/>
+						<line number="246" hits="1"/>
+						<line number="249" hits="1"/>
+						<line number="250" hits="1"/>
+						<line number="253" hits="1"/>
+						<line number="254" hits="1"/>
+						<line number="255" hits="1"/>
+						<line number="256" hits="1"/>
+						<line number="257" hits="1"/>
+						<line number="258" hits="1"/>
+						<line number="259" hits="1"/>
+						<line number="260" hits="1"/>
+						<line number="262" hits="1"/>
+						<line number="263" hits="0"/>
+						<line number="271" hits="1"/>
+						<line number="274" hits="1"/>
+						<line number="275" hits="1"/>
+						<line number="276" hits="1"/>
+						<line number="277" hits="1"/>
+						<line number="278" hits="1"/>
+						<line number="280" hits="0"/>
+						<line number="281" hits="1"/>
+						<line number="284" hits="1"/>
+						<line number="293" hits="1"/>
+						<line number="294" hits="1"/>
+						<line number="299" hits="1"/>
+						<line number="300" hits="0"/>
+						<line number="302" hits="1"/>
+						<line number="303" hits="1"/>
+						<line number="305" hits="0"/>
+						<line number="308" hits="1"/>
+						<line number="309" hits="1"/>
+						<line number="310" hits="1"/>
+						<line number="311" hits="1"/>
+						<line number="314" hits="1"/>
+						<line number="315" hits="0"/>
+						<line number="318" hits="1"/>
+						<line number="319" hits="0"/>
+						<line number="323" hits="1"/>
+						<line number="325" hits="1"/>
+						<line number="326" hits="1"/>
+						<line number="327" hits="1"/>
+						<line number="338" hits="1"/>
+						<line number="339" hits="1"/>
+						<line number="342" hits="1"/>
+						<line number="344" hits="1"/>
+						<line number="345" hits="1"/>
+						<line number="346" hits="1"/>
+						<line number="347" hits="1"/>
+						<line number="350" hits="1"/>
+						<line number="351" hits="0"/>
+						<line number="358" hits="1"/>
+						<line number="359" hits="1"/>
+						<line number="360" hits="1"/>
+						<line number="361" hits="1"/>
+						<line number="362" hits="1"/>
+						<line number="365" hits="1"/>
+						<line number="366" hits="1"/>
+						<line number="367" hits="1"/>
+						<line number="368" hits="1"/>
+						<line number="369" hits="1"/>
+						<line number="370" hits="1"/>
+						<line number="371" hits="1"/>
+					</lines>
+				</class>
+				<class name="commands.py" filename="commands.py" complexity="0" line-rate="0.6143" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="56" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="0"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="0"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="0"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="107" hits="1"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="116" hits="1"/>
+					</lines>
+				</class>
+				<class name="db.py" filename="db.py" complexity="0" line-rate="0.744" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="0"/>
+						<line number="94" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="143" hits="1"/>
+						<line number="144" hits="1"/>
+						<line number="145" hits="1"/>
+						<line number="146" hits="1"/>
+						<line number="148" hits="1"/>
+						<line number="150" hits="1"/>
+						<line number="151" hits="1"/>
+						<line number="153" hits="1"/>
+						<line number="154" hits="1"/>
+						<line number="155" hits="1"/>
+						<line number="156" hits="1"/>
+						<line number="157" hits="1"/>
+						<line number="158" hits="1"/>
+						<line number="159" hits="1"/>
+						<line number="161" hits="1"/>
+						<line number="162" hits="1"/>
+						<line number="163" hits="1"/>
+						<line number="166" hits="0"/>
+						<line number="167" hits="0"/>
+						<line number="171" hits="1"/>
+						<line number="173" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="176" hits="1"/>
+						<line number="177" hits="1"/>
+						<line number="178" hits="1"/>
+						<line number="180" hits="1"/>
+						<line number="181" hits="1"/>
+						<line number="182" hits="1"/>
+						<line number="183" hits="1"/>
+						<line number="184" hits="1"/>
+						<line number="185" hits="1"/>
+						<line number="187" hits="1"/>
+						<line number="188" hits="1"/>
+						<line number="189" hits="1"/>
+						<line number="191" hits="1"/>
+						<line number="192" hits="1"/>
+						<line number="193" hits="0"/>
+					</lines>
+				</class>
+				<class name="decorators.py" filename="decorators.py" complexity="0" line-rate="0.8095" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="0"/>
+						<line number="70" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="95" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="1"/>
+						<line number="108" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="116" hits="1"/>
+						<line number="123" hits="1"/>
+						<line number="131" hits="1"/>
+						<line number="133" hits="1"/>
+						<line number="134" hits="0"/>
+						<line number="136" hits="1"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="1"/>
+						<line number="140" hits="1"/>
+						<line number="141" hits="1"/>
+						<line number="142" hits="1"/>
+						<line number="145" hits="0"/>
+						<line number="148" hits="1"/>
+						<line number="149" hits="1"/>
+						<line number="150" hits="1"/>
+						<line number="151" hits="0"/>
+						<line number="152" hits="1"/>
+						<line number="153" hits="1"/>
+						<line number="154" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="157" hits="1"/>
+						<line number="158" hits="1"/>
+						<line number="159" hits="1"/>
+						<line number="160" hits="1"/>
+						<line number="161" hits="1"/>
+						<line number="164" hits="0"/>
+						<line number="167" hits="1"/>
+						<line number="168" hits="1"/>
+						<line number="169" hits="1"/>
+						<line number="170" hits="0"/>
+						<line number="171" hits="1"/>
+						<line number="172" hits="1"/>
+						<line number="173" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="178" hits="1"/>
+						<line number="183" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="197" hits="1"/>
+						<line number="202" hits="1"/>
+						<line number="204" hits="1"/>
+						<line number="206" hits="1"/>
+						<line number="209" hits="1"/>
+						<line number="214" hits="1"/>
+						<line number="217" hits="1"/>
+						<line number="218" hits="1"/>
+						<line number="219" hits="1"/>
+						<line number="220" hits="0"/>
+						<line number="224" hits="1"/>
+						<line number="225" hits="0"/>
+						<line number="229" hits="1"/>
+						<line number="230" hits="0"/>
+						<line number="232" hits="1"/>
+					</lines>
+				</class>
+				<class name="helpers.py" filename="helpers.py" complexity="0" line-rate="0.8547" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="0"/>
+						<line number="42" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="105" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="1"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="112" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="122" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="125" hits="1"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="1"/>
+						<line number="132" hits="1"/>
+						<line number="134" hits="1"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="1"/>
+						<line number="137" hits="1"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="142" hits="1"/>
+						<line number="145" hits="1"/>
+						<line number="146" hits="1"/>
+						<line number="149" hits="1"/>
+						<line number="150" hits="0"/>
+						<line number="151" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="158" hits="1"/>
+						<line number="159" hits="1"/>
+						<line number="165" hits="1"/>
+						<line number="166" hits="0"/>
+						<line number="167" hits="1"/>
+						<line number="168" hits="1"/>
+						<line number="169" hits="1"/>
+						<line number="170" hits="1"/>
+						<line number="171" hits="1"/>
+						<line number="172" hits="1"/>
+						<line number="173" hits="1"/>
+						<line number="174" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="176" hits="0"/>
+						<line number="178" hits="1"/>
+						<line number="179" hits="1"/>
+						<line number="180" hits="1"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="185" hits="1"/>
+					</lines>
+				</class>
+				<class name="jinja2_templating.py" filename="jinja2_templating.py" complexity="0" line-rate="0.875" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="lnurl.py" complexity="0" line-rate="0.25" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="6" hits="0"/>
+						<line number="7" hits="0"/>
+						<line number="8" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="15" hits="0"/>
+						<line number="16" hits="0"/>
+					</lines>
+				</class>
+				<class name="proxy_fix.py" filename="proxy_fix.py" complexity="0" line-rate="0" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="0"/>
+						<line number="2" hits="0"/>
+						<line number="3" hits="0"/>
+						<line number="4" hits="0"/>
+						<line number="6" hits="0"/>
+						<line number="7" hits="0"/>
+						<line number="8" hits="0"/>
+						<line number="11" hits="0"/>
+						<line number="12" hits="0"/>
+						<line number="13" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="15" hits="0"/>
+						<line number="16" hits="0"/>
+						<line number="17" hits="0"/>
+						<line number="18" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+					</lines>
+				</class>
+				<class name="requestvars.py" filename="requestvars.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+					</lines>
+				</class>
+				<class name="server.py" filename="server.py" complexity="0" line-rate="0" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="0"/>
+						<line number="3" hits="0"/>
+						<line number="4" hits="0"/>
+						<line number="6" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="15" hits="0"/>
+						<line number="16" hits="0"/>
+						<line number="17" hits="0"/>
+						<line number="18" hits="0"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+					</lines>
+				</class>
+				<class name="settings.py" filename="settings.py" complexity="0" line-rate="0.9444" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="tasks.py" complexity="0" line-rate="0.403" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="51" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="69" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="109" hits="1"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="core" line-rate="0.5319" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="core/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="core/crud.py" complexity="0" line-rate="0.5683" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="1"/>
+						<line number="109" hits="1"/>
+						<line number="110" hits="1"/>
+						<line number="112" hits="1"/>
+						<line number="115" hits="1"/>
+						<line number="118" hits="0"/>
+						<line number="128" hits="1"/>
+						<line number="131" hits="0"/>
+						<line number="144" hits="1"/>
+						<line number="147" hits="1"/>
+						<line number="156" hits="1"/>
+						<line number="159" hits="1"/>
+						<line number="162" hits="1"/>
+						<line number="171" hits="1"/>
+						<line number="172" hits="1"/>
+						<line number="174" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="177" hits="1"/>
+						<line number="184" hits="1"/>
+						<line number="190" hits="1"/>
+						<line number="191" hits="1"/>
+						<line number="192" hits="1"/>
+						<line number="193" hits="0"/>
+						<line number="195" hits="1"/>
+						<line number="196" hits="1"/>
+						<line number="197" hits="1"/>
+						<line number="199" hits="1"/>
+						<line number="209" hits="1"/>
+						<line number="212" hits="1"/>
+						<line number="215" hits="1"/>
+						<line number="224" hits="1"/>
+						<line number="227" hits="1"/>
+						<line number="244" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="248" hits="0"/>
+						<line number="249" hits="0"/>
+						<line number="250" hits="0"/>
+						<line number="251" hits="0"/>
+						<line number="253" hits="0"/>
+						<line number="254" hits="0"/>
+						<line number="256" hits="0"/>
+						<line number="257" hits="0"/>
+						<line number="258" hits="0"/>
+						<line number="260" hits="0"/>
+						<line number="261" hits="0"/>
+						<line number="262" hits="0"/>
+						<line number="263" hits="0"/>
+						<line number="264" hits="0"/>
+						<line number="265" hits="0"/>
+						<line number="269" hits="0"/>
+						<line number="270" hits="0"/>
+						<line number="271" hits="0"/>
+						<line number="272" hits="0"/>
+						<line number="273" hits="0"/>
+						<line number="274" hits="0"/>
+						<line number="278" hits="0"/>
+						<line number="279" hits="0"/>
+						<line number="280" hits="0"/>
+						<line number="282" hits="0"/>
+						<line number="283" hits="0"/>
+						<line number="285" hits="0"/>
+						<line number="291" hits="0"/>
+						<line number="292" hits="0"/>
+						<line number="293" hits="0"/>
+						<line number="295" hits="0"/>
+						<line number="305" hits="0"/>
+						<line number="308" hits="1"/>
+						<line number="312" hits="0"/>
+						<line number="321" hits="0"/>
+						<line number="330" hits="0"/>
+						<line number="331" hits="0"/>
+						<line number="332" hits="0"/>
+						<line number="333" hits="0"/>
+						<line number="334" hits="0"/>
+						<line number="336" hits="0"/>
+						<line number="337" hits="0"/>
+						<line number="338" hits="0"/>
+						<line number="339" hits="0"/>
+						<line number="340" hits="0"/>
+						<line number="353" hits="1"/>
+						<line number="368" hits="1"/>
+						<line number="392" hits="1"/>
+						<line number="393" hits="1"/>
+						<line number="395" hits="1"/>
+						<line number="398" hits="1"/>
+						<line number="401" hits="1"/>
+						<line number="407" hits="1"/>
+						<line number="408" hits="1"/>
+						<line number="413" hits="1"/>
+						<line number="416" hits="1"/>
+						<line number="423" hits="1"/>
+						<line number="424" hits="1"/>
+						<line number="426" hits="1"/>
+						<line number="433" hits="1"/>
+						<line number="436" hits="0"/>
+						<line number="438" hits="0"/>
+						<line number="447" hits="1"/>
+						<line number="450" hits="0"/>
+						<line number="458" hits="0"/>
+						<line number="461" hits="1"/>
+						<line number="462" hits="0"/>
+						<line number="463" hits="0"/>
+						<line number="470" hits="1"/>
+						<line number="473" hits="0"/>
+						<line number="482" hits="1"/>
+						<line number="485" hits="0"/>
+						<line number="493" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="core/migrations.py" complexity="0" line-rate="0.1795" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="84" hits="1"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="129" hits="1"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="139" hits="1"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="164" hits="1"/>
+						<line number="169" hits="0"/>
+						<line number="181" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="core/models.py" complexity="0" line-rate="0.6638" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="0"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="0"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="107" hits="1"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="115" hits="0"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="0"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="1"/>
+						<line number="123" hits="0"/>
+						<line number="125" hits="1"/>
+						<line number="126" hits="1"/>
+						<line number="127" hits="1"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="1"/>
+						<line number="131" hits="0"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="140" hits="1"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="151" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="166" hits="1"/>
+						<line number="167" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="172" hits="1"/>
+						<line number="173" hits="1"/>
+						<line number="174" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="177" hits="1"/>
+						<line number="178" hits="1"/>
+						<line number="179" hits="0"/>
+					</lines>
+				</class>
+				<class name="services.py" filename="core/services.py" complexity="0" line-rate="0.5322" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="0"/>
+						<line number="73" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="0"/>
+						<line number="112" hits="1"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="115" hits="1"/>
+						<line number="116" hits="1"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="120" hits="1"/>
+						<line number="130" hits="1"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="1"/>
+						<line number="134" hits="1"/>
+						<line number="142" hits="1"/>
+						<line number="145" hits="1"/>
+						<line number="153" hits="1"/>
+						<line number="154" hits="1"/>
+						<line number="155" hits="1"/>
+						<line number="156" hits="1"/>
+						<line number="157" hits="1"/>
+						<line number="158" hits="0"/>
+						<line number="161" hits="1"/>
+						<line number="163" hits="1"/>
+						<line number="164" hits="1"/>
+						<line number="168" hits="1"/>
+						<line number="169" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="177" hits="1"/>
+						<line number="179" hits="1"/>
+						<line number="181" hits="1"/>
+						<line number="184" hits="1"/>
+						<line number="185" hits="1"/>
+						<line number="186" hits="1"/>
+						<line number="187" hits="1"/>
+						<line number="188" hits="1"/>
+						<line number="196" hits="1"/>
+						<line number="197" hits="1"/>
+						<line number="199" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="201" hits="0"/>
+						<line number="202" hits="0"/>
+						<line number="203" hits="0"/>
+						<line number="207" hits="1"/>
+						<line number="208" hits="1"/>
+						<line number="211" hits="1"/>
+						<line number="219" hits="0"/>
+						<line number="220" hits="0"/>
+						<line number="222" hits="0"/>
+						<line number="224" hits="0"/>
+						<line number="225" hits="0"/>
+						<line number="226" hits="0"/>
+						<line number="227" hits="0"/>
+						<line number="229" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="237" hits="0"/>
+						<line number="238" hits="0"/>
+						<line number="241" hits="0"/>
+						<line number="243" hits="0"/>
+						<line number="244" hits="0"/>
+						<line number="246" hits="0"/>
+						<line number="248" hits="0"/>
+						<line number="249" hits="0"/>
+						<line number="254" hits="0"/>
+						<line number="255" hits="0"/>
+						<line number="257" hits="0"/>
+						<line number="258" hits="0"/>
+						<line number="259" hits="0"/>
+						<line number="260" hits="0"/>
+						<line number="261" hits="0"/>
+						<line number="264" hits="1"/>
+						<line number="269" hits="0"/>
+						<line number="271" hits="0"/>
+						<line number="273" hits="0"/>
+						<line number="275" hits="0"/>
+						<line number="277" hits="0"/>
+						<line number="279" hits="0"/>
+						<line number="281" hits="0"/>
+						<line number="283" hits="0"/>
+						<line number="286" hits="0"/>
+						<line number="288" hits="0"/>
+						<line number="290" hits="0"/>
+						<line number="293" hits="0"/>
+						<line number="294" hits="0"/>
+						<line number="298" hits="0"/>
+						<line number="299" hits="0"/>
+						<line number="301" hits="0"/>
+						<line number="302" hits="0"/>
+						<line number="303" hits="0"/>
+						<line number="305" hits="0"/>
+						<line number="306" hits="0"/>
+						<line number="307" hits="0"/>
+						<line number="308" hits="0"/>
+						<line number="309" hits="0"/>
+						<line number="310" hits="0"/>
+						<line number="311" hits="0"/>
+						<line number="312" hits="0"/>
+						<line number="313" hits="0"/>
+						<line number="315" hits="0"/>
+						<line number="317" hits="0"/>
+						<line number="319" hits="0"/>
+						<line number="320" hits="0"/>
+						<line number="328" hits="0"/>
+						<line number="329" hits="0"/>
+						<line number="330" hits="0"/>
+						<line number="331" hits="0"/>
+						<line number="333" hits="0"/>
+						<line number="334" hits="0"/>
+						<line number="335" hits="0"/>
+						<line number="340" hits="1"/>
+						<line number="343" hits="1"/>
+						<line number="344" hits="1"/>
+						<line number="345" hits="0"/>
+						<line number="346" hits="1"/>
+						<line number="347" hits="1"/>
+						<line number="349" hits="0"/>
+						<line number="350" hits="1"/>
+						<line number="351" hits="1"/>
+						<line number="352" hits="0"/>
+						<line number="353" hits="0"/>
+						<line number="354" hits="0"/>
+						<line number="355" hits="0"/>
+						<line number="356" hits="0"/>
+						<line number="359" hits="0"/>
+						<line number="360" hits="0"/>
+						<line number="364" hits="1"/>
+						<line number="365" hits="1"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="core/tasks.py" complexity="0" line-rate="0.3111" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="0"/>
+						<line number="18" hits="0"/>
+						<line number="19" hits="0"/>
+						<line number="22" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="core.views" line-rate="0.4693" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="core/views/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
+				<class name="api.py" filename="core/views/api.py" complexity="0" line-rate="0.4118" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="112" hits="1"/>
+						<line number="113" hits="1"/>
+						<line number="118" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="1"/>
+						<line number="140" hits="1"/>
+						<line number="141" hits="1"/>
+						<line number="142" hits="1"/>
+						<line number="143" hits="1"/>
+						<line number="144" hits="1"/>
+						<line number="145" hits="1"/>
+						<line number="146" hits="1"/>
+						<line number="147" hits="1"/>
+						<line number="148" hits="1"/>
+						<line number="149" hits="1"/>
+						<line number="152" hits="1"/>
+						<line number="153" hits="1"/>
+						<line number="154" hits="1"/>
+						<line number="155" hits="1"/>
+						<line number="157" hits="1"/>
+						<line number="158" hits="1"/>
+						<line number="159" hits="1"/>
+						<line number="160" hits="1"/>
+						<line number="162" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="166" hits="1"/>
+						<line number="167" hits="1"/>
+						<line number="168" hits="1"/>
+						<line number="178" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="180" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="183" hits="1"/>
+						<line number="185" hits="1"/>
+						<line number="186" hits="1"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="191" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="204" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="207" hits="0"/>
+						<line number="208" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="211" hits="0"/>
+						<line number="212" hits="0"/>
+						<line number="213" hits="0"/>
+						<line number="215" hits="1"/>
+						<line number="224" hits="1"/>
+						<line number="225" hits="1"/>
+						<line number="226" hits="1"/>
+						<line number="227" hits="0"/>
+						<line number="228" hits="0"/>
+						<line number="229" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="231" hits="0"/>
+						<line number="232" hits="0"/>
+						<line number="233" hits="0"/>
+						<line number="234" hits="0"/>
+						<line number="236" hits="1"/>
+						<line number="243" hits="1"/>
+						<line number="247" hits="1"/>
+						<line number="251" hits="1"/>
+						<line number="252" hits="1"/>
+						<line number="253" hits="0"/>
+						<line number="257" hits="1"/>
+						<line number="260" hits="1"/>
+						<line number="262" hits="1"/>
+						<line number="264" hits="1"/>
+						<line number="270" hits="1"/>
+						<line number="271" hits="1"/>
+						<line number="272" hits="1"/>
+						<line number="273" hits="1"/>
+						<line number="274" hits="1"/>
+						<line number="275" hits="1"/>
+						<line number="278" hits="1"/>
+						<line number="279" hits="1"/>
+						<line number="282" hits="0"/>
+						<line number="284" hits="0"/>
+						<line number="285" hits="0"/>
+						<line number="286" hits="0"/>
+						<line number="291" hits="0"/>
+						<line number="292" hits="0"/>
+						<line number="293" hits="0"/>
+						<line number="294" hits="0"/>
+						<line number="299" hits="0"/>
+						<line number="300" hits="0"/>
+						<line number="301" hits="0"/>
+						<line number="306" hits="0"/>
+						<line number="307" hits="0"/>
+						<line number="312" hits="0"/>
+						<line number="313" hits="0"/>
+						<line number="314" hits="0"/>
+						<line number="319" hits="0"/>
+						<line number="320" hits="0"/>
+						<line number="325" hits="0"/>
+						<line number="327" hits="0"/>
+						<line number="328" hits="0"/>
+						<line number="329" hits="0"/>
+						<line number="330" hits="0"/>
+						<line number="331" hits="0"/>
+						<line number="332" hits="0"/>
+						<line number="339" hits="0"/>
+						<line number="347" hits="1"/>
+						<line number="348" hits="0"/>
+						<line number="350" hits="0"/>
+						<line number="352" hits="0"/>
+						<line number="353" hits="0"/>
+						<line number="355" hits="0"/>
+						<line number="357" hits="0"/>
+						<line number="359" hits="0"/>
+						<line number="360" hits="0"/>
+						<line number="361" hits="0"/>
+						<line number="362" hits="0"/>
+						<line number="364" hits="0"/>
+						<line number="366" hits="0"/>
+						<line number="368" hits="0"/>
+						<line number="370" hits="0"/>
+						<line number="371" hits="0"/>
+						<line number="375" hits="0"/>
+						<line number="377" hits="0"/>
+						<line number="378" hits="0"/>
+						<line number="381" hits="1"/>
+						<line number="382" hits="1"/>
+						<line number="385" hits="0"/>
+						<line number="390" hits="1"/>
+						<line number="391" hits="1"/>
+						<line number="394" hits="1"/>
+						<line number="398" hits="1"/>
+						<line number="401" hits="1"/>
+						<line number="402" hits="0"/>
+						<line number="405" hits="1"/>
+						<line number="406" hits="1"/>
+						<line number="409" hits="1"/>
+						<line number="410" hits="0"/>
+						<line number="413" hits="1"/>
+						<line number="414" hits="1"/>
+						<line number="415" hits="1"/>
+						<line number="416" hits="1"/>
+						<line number="418" hits="0"/>
+						<line number="419" hits="0"/>
+						<line number="420" hits="0"/>
+						<line number="421" hits="0"/>
+						<line number="422" hits="0"/>
+						<line number="423" hits="0"/>
+						<line number="425" hits="0"/>
+						<line number="426" hits="0"/>
+						<line number="431" hits="0"/>
+						<line number="434" hits="1"/>
+						<line number="435" hits="1"/>
+						<line number="436" hits="0"/>
+						<line number="437" hits="0"/>
+						<line number="438" hits="0"/>
+						<line number="439" hits="0"/>
+						<line number="441" hits="0"/>
+						<line number="442" hits="0"/>
+						<line number="443" hits="0"/>
+						<line number="444" hits="0"/>
+						<line number="452" hits="0"/>
+						<line number="457" hits="0"/>
+						<line number="459" hits="0"/>
+						<line number="460" hits="0"/>
+						<line number="461" hits="0"/>
+						<line number="463" hits="0"/>
+						<line number="464" hits="0"/>
+						<line number="466" hits="0"/>
+						<line number="467" hits="0"/>
+						<line number="468" hits="0"/>
+						<line number="469" hits="0"/>
+						<line number="474" hits="0"/>
+						<line number="475" hits="0"/>
+						<line number="476" hits="0"/>
+						<line number="477" hits="0"/>
+						<line number="485" hits="0"/>
+						<line number="486" hits="0"/>
+						<line number="487" hits="0"/>
+						<line number="488" hits="0"/>
+						<line number="489" hits="0"/>
+						<line number="497" hits="0"/>
+						<line number="498" hits="0"/>
+						<line number="499" hits="0"/>
+						<line number="502" hits="0"/>
+						<line number="503" hits="0"/>
+						<line number="504" hits="0"/>
+						<line number="507" hits="0"/>
+						<line number="508" hits="0"/>
+						<line number="511" hits="0"/>
+						<line number="514" hits="0"/>
+						<line number="515" hits="0"/>
+						<line number="516" hits="0"/>
+						<line number="517" hits="0"/>
+						<line number="519" hits="0"/>
+						<line number="524" hits="0"/>
+						<line number="525" hits="0"/>
+						<line number="526" hits="0"/>
+						<line number="527" hits="0"/>
+						<line number="528" hits="0"/>
+						<line number="529" hits="0"/>
+						<line number="530" hits="0"/>
+						<line number="531" hits="0"/>
+						<line number="532" hits="0"/>
+						<line number="533" hits="0"/>
+						<line number="535" hits="0"/>
+						<line number="536" hits="0"/>
+						<line number="544" hits="0"/>
+						<line number="547" hits="1"/>
+						<line number="548" hits="1"/>
+						<line number="551" hits="1"/>
+						<line number="552" hits="1"/>
+						<line number="553" hits="1"/>
+						<line number="554" hits="1"/>
+						<line number="555" hits="1"/>
+						<line number="556" hits="0"/>
+						<line number="557" hits="0"/>
+						<line number="559" hits="1"/>
+						<line number="560" hits="1"/>
+						<line number="572" hits="0"/>
+						<line number="573" hits="0"/>
+						<line number="576" hits="1"/>
+						<line number="577" hits="1"/>
+						<line number="580" hits="1"/>
+						<line number="581" hits="1"/>
+						<line number="584" hits="0"/>
+						<line number="585" hits="0"/>
+						<line number="586" hits="0"/>
+						<line number="589" hits="0"/>
+						<line number="592" hits="1"/>
+						<line number="593" hits="1"/>
+						<line number="594" hits="0"/>
+						<line number="597" hits="1"/>
+						<line number="598" hits="1"/>
+						<line number="599" hits="1"/>
+						<line number="600" hits="1"/>
+						<line number="603" hits="1"/>
+						<line number="604" hits="1"/>
+						<line number="605" hits="0"/>
+						<line number="606" hits="0"/>
+						<line number="607" hits="0"/>
+						<line number="608" hits="0"/>
+						<line number="609" hits="0"/>
+						<line number="610" hits="0"/>
+						<line number="613" hits="0"/>
+						<line number="615" hits="0"/>
+						<line number="616" hits="0"/>
+						<line number="617" hits="0"/>
+						<line number="618" hits="0"/>
+						<line number="621" hits="1"/>
+						<line number="622" hits="1"/>
+						<line number="623" hits="0"/>
+						<line number="624" hits="0"/>
+						<line number="625" hits="0"/>
+						<line number="626" hits="0"/>
+						<line number="628" hits="0"/>
+						<line number="629" hits="0"/>
+						<line number="631" hits="0"/>
+					</lines>
+				</class>
+				<class name="generic.py" filename="core/views/generic.py" complexity="0" line-rate="0.5896" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="1"/>
+						<line number="122" hits="1"/>
+						<line number="123" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="126" hits="1"/>
+						<line number="127" hits="1"/>
+						<line number="128" hits="0"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="0"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="1"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="1"/>
+						<line number="141" hits="1"/>
+						<line number="142" hits="1"/>
+						<line number="146" hits="1"/>
+						<line number="151" hits="1"/>
+						<line number="154" hits="1"/>
+						<line number="155" hits="1"/>
+						<line number="156" hits="0"/>
+						<line number="160" hits="1"/>
+						<line number="172" hits="1"/>
+						<line number="173" hits="1"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="176" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="180" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="193" hits="1"/>
+						<line number="194" hits="1"/>
+						<line number="195" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="197" hits="0"/>
+						<line number="199" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="201" hits="0"/>
+						<line number="203" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="206" hits="0"/>
+						<line number="207" hits="0"/>
+						<line number="208" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="211" hits="0"/>
+						<line number="213" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="217" hits="0"/>
+						<line number="220" hits="1"/>
+						<line number="221" hits="1"/>
+						<line number="222" hits="0"/>
+						<line number="223" hits="0"/>
+						<line number="225" hits="0"/>
+						<line number="226" hits="0"/>
+						<line number="228" hits="0"/>
+						<line number="229" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="232" hits="0"/>
+						<line number="233" hits="0"/>
+						<line number="238" hits="0"/>
+						<line number="243" hits="1"/>
+						<line number="244" hits="1"/>
+						<line number="245" hits="0"/>
+						<line number="246" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="250" hits="1"/>
+						<line number="253" hits="1"/>
+						<line number="254" hits="0"/>
+						<line number="255" hits="0"/>
+						<line number="256" hits="0"/>
+						<line number="257" hits="0"/>
+						<line number="259" hits="0"/>
+						<line number="269" hits="0"/>
+						<line number="275" hits="1"/>
+						<line number="276" hits="1"/>
+						<line number="277" hits="0"/>
+						<line number="280" hits="1"/>
+						<line number="281" hits="1"/>
+						<line number="282" hits="0"/>
+						<line number="283" hits="0"/>
+						<line number="284" hits="0"/>
+						<line number="286" hits="0"/>
+					</lines>
+				</class>
+				<class name="public_api.py" filename="core/views/public_api.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.bleskomat" line-rate="0.747" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/bleskomat/__init__.py" complexity="0" line-rate="0.9167" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/bleskomat/crud.py" complexity="0" line-rate="0.7872" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="0"/>
+						<line number="78" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="105" hits="1"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="1"/>
+						<line number="110" hits="1"/>
+						<line number="113" hits="1"/>
+					</lines>
+				</class>
+				<class name="exchange_rates.py" filename="extensions/bleskomat/exchange_rates.py" complexity="0" line-rate="0.7692" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="77" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="1"/>
+					</lines>
+				</class>
+				<class name="helpers.py" filename="extensions/bleskomat/helpers.py" complexity="0" line-rate="0.6023" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="0"/>
+						<line number="75" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="154" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl_api.py" filename="extensions/bleskomat/lnurl_api.py" complexity="0" line-rate="0.8841" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="0"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="1"/>
+						<line number="100" hits="1"/>
+						<line number="105" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="1"/>
+						<line number="110" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="0"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="123" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="129" hits="1"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/bleskomat/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="0"/>
+						<line number="20" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/bleskomat/models.py" complexity="0" line-rate="0.8774" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="0"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="0"/>
+						<line number="105" hits="1"/>
+						<line number="106" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="112" hits="1"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="115" hits="1"/>
+						<line number="116" hits="1"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="1"/>
+						<line number="123" hits="1"/>
+						<line number="126" hits="1"/>
+						<line number="127" hits="1"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="130" hits="1"/>
+						<line number="132" hits="1"/>
+						<line number="133" hits="1"/>
+						<line number="134" hits="1"/>
+						<line number="143" hits="1"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/bleskomat/views.py" complexity="0" line-rate="0.8571" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="0"/>
+						<line number="23" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/bleskomat/views_api.py" complexity="0" line-rate="0.413" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="89" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.copilot" line-rate="0.5593" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/copilot/__init__.py" complexity="0" line-rate="0.9444" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/copilot/crud.py" complexity="0" line-rate="0.3913" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="0"/>
+						<line number="15" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="69" hits="1"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="extensions/copilot/lnurl.py" complexity="0" line-rate="0.3846" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="40" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/copilot/migrations.py" complexity="0" line-rate="0.375" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="6" hits="0"/>
+						<line number="36" hits="1"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="77" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/copilot/models.py" complexity="0" line-rate="0.9661" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/copilot/tasks.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="0"/>
+						<line number="75" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/copilot/views.py" complexity="0" line-rate="0.5625" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="0"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="63" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/copilot/views_api.py" complexity="0" line-rate="0.4038" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="72" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.discordbot" line-rate="0.5796" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/discordbot/__init__.py" complexity="0" line-rate="0.9091" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/discordbot/crud.py" complexity="0" line-rate="0.3191" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="78" hits="1"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="115" hits="1"/>
+						<line number="116" hits="0"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/discordbot/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="19" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/discordbot/models.py" complexity="0" line-rate="0.9643" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/discordbot/views.py" complexity="0" line-rate="0.8889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/discordbot/views_api.py" complexity="0" line-rate="0.5085" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="89" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="105" hits="0"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="1"/>
+						<line number="112" hits="0"/>
+						<line number="115" hits="1"/>
+						<line number="116" hits="1"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.events" line-rate="0.4431" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/events/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="0"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/events/crud.py" complexity="0" line-rate="0.2615" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="0"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="0"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="111" hits="1"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="126" hits="1"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="0"/>
+						<line number="145" hits="1"/>
+						<line number="146" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="153" hits="1"/>
+						<line number="154" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="161" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/events/migrations.py" complexity="0" line-rate="0.1429" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="40" hits="1"/>
+						<line number="42" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="83" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/events/models.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/events/views.py" complexity="0" line-rate="0.4878" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="99" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/events/views_api.py" complexity="0" line-rate="0.3407" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="92" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="120" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="146" hits="1"/>
+						<line number="147" hits="1"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="166" hits="1"/>
+						<line number="167" hits="1"/>
+						<line number="168" hits="0"/>
+						<line number="174" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="176" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="192" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.hivemind" line-rate="0.8824" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/hivemind/__init__.py" complexity="0" line-rate="0.875" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/hivemind/migrations.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
+				<class name="views.py" filename="extensions/hivemind/views.py" complexity="0" line-rate="0.8889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.invoices" line-rate="0.7397" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/invoices/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/invoices/crud.py" complexity="0" line-rate="0.5147" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="105" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="1"/>
+						<line number="123" hits="1"/>
+						<line number="124" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="149" hits="1"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="167" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="186" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="190" hits="1"/>
+						<line number="191" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="204" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="206" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/invoices/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="42" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/invoices/models.py" complexity="0" line-rate="0.9872" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="0"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/invoices/tasks.py" complexity="0" line-rate="0.44" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/invoices/views.py" complexity="0" line-rate="0.76" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="47" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/invoices/views_api.py" complexity="0" line-rate="0.76" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="86" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="0"/>
+						<line number="104" hits="1"/>
+						<line number="105" hits="0"/>
+						<line number="109" hits="1"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="123" hits="1"/>
+						<line number="126" hits="1"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="1"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="0"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="1"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="1"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.jukebox" line-rate="0.3627" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/jukebox/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/jukebox/crud.py" complexity="0" line-rate="0.2889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="13" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="38" hits="1"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="0"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="95" hits="1"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="0"/>
+						<line number="110" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/jukebox/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="30" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/jukebox/models.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/jukebox/tasks.py" complexity="0" line-rate="0.6923" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="0"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/jukebox/views.py" complexity="0" line-rate="0.5926" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="49" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/jukebox/views_api.py" complexity="0" line-rate="0.1711" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="111" hits="1"/>
+						<line number="112" hits="1"/>
+						<line number="117" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="159" hits="1"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="162" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="167" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="191" hits="0"/>
+						<line number="197" hits="1"/>
+						<line number="198" hits="1"/>
+						<line number="201" hits="0"/>
+						<line number="202" hits="0"/>
+						<line number="203" hits="0"/>
+						<line number="204" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="206" hits="0"/>
+						<line number="211" hits="0"/>
+						<line number="212" hits="0"/>
+						<line number="213" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="216" hits="0"/>
+						<line number="219" hits="0"/>
+						<line number="220" hits="0"/>
+						<line number="224" hits="0"/>
+						<line number="226" hits="0"/>
+						<line number="234" hits="1"/>
+						<line number="235" hits="1"/>
+						<line number="236" hits="0"/>
+						<line number="237" hits="0"/>
+						<line number="239" hits="0"/>
+						<line number="240" hits="0"/>
+						<line number="241" hits="0"/>
+						<line number="243" hits="0"/>
+						<line number="244" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="246" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="248" hits="0"/>
+						<line number="249" hits="0"/>
+						<line number="252" hits="0"/>
+						<line number="253" hits="0"/>
+						<line number="257" hits="0"/>
+						<line number="264" hits="0"/>
+						<line number="265" hits="0"/>
+						<line number="268" hits="0"/>
+						<line number="270" hits="0"/>
+						<line number="273" hits="1"/>
+						<line number="274" hits="1"/>
+						<line number="277" hits="0"/>
+						<line number="278" hits="0"/>
+						<line number="279" hits="0"/>
+						<line number="280" hits="0"/>
+						<line number="281" hits="0"/>
+						<line number="282" hits="0"/>
+						<line number="283" hits="0"/>
+						<line number="284" hits="0"/>
+						<line number="285" hits="0"/>
+						<line number="286" hits="0"/>
+						<line number="287" hits="0"/>
+						<line number="289" hits="0"/>
+						<line number="292" hits="1"/>
+						<line number="293" hits="1"/>
+						<line number="299" hits="0"/>
+						<line number="300" hits="0"/>
+						<line number="301" hits="0"/>
+						<line number="302" hits="0"/>
+						<line number="303" hits="0"/>
+						<line number="304" hits="0"/>
+						<line number="305" hits="0"/>
+						<line number="306" hits="0"/>
+						<line number="307" hits="0"/>
+						<line number="312" hits="0"/>
+						<line number="317" hits="0"/>
+						<line number="318" hits="0"/>
+						<line number="319" hits="0"/>
+						<line number="321" hits="0"/>
+						<line number="322" hits="0"/>
+						<line number="323" hits="0"/>
+						<line number="324" hits="0"/>
+						<line number="331" hits="0"/>
+						<line number="332" hits="0"/>
+						<line number="333" hits="0"/>
+						<line number="334" hits="0"/>
+						<line number="335" hits="0"/>
+						<line number="336" hits="0"/>
+						<line number="340" hits="0"/>
+						<line number="341" hits="0"/>
+						<line number="346" hits="0"/>
+						<line number="350" hits="0"/>
+						<line number="353" hits="0"/>
+						<line number="354" hits="0"/>
+						<line number="355" hits="0"/>
+						<line number="363" hits="0"/>
+						<line number="364" hits="0"/>
+						<line number="366" hits="0"/>
+						<line number="367" hits="0"/>
+						<line number="368" hits="0"/>
+						<line number="369" hits="0"/>
+						<line number="373" hits="0"/>
+						<line number="374" hits="0"/>
+						<line number="379" hits="0"/>
+						<line number="383" hits="0"/>
+						<line number="386" hits="0"/>
+						<line number="387" hits="0"/>
+						<line number="388" hits="0"/>
+						<line number="389" hits="0"/>
+						<line number="392" hits="0"/>
+						<line number="393" hits="0"/>
+						<line number="397" hits="0"/>
+						<line number="400" hits="0"/>
+						<line number="406" hits="1"/>
+						<line number="407" hits="1"/>
+						<line number="410" hits="0"/>
+						<line number="411" hits="0"/>
+						<line number="412" hits="0"/>
+						<line number="413" hits="0"/>
+						<line number="414" hits="0"/>
+						<line number="415" hits="0"/>
+						<line number="416" hits="0"/>
+						<line number="421" hits="0"/>
+						<line number="422" hits="0"/>
+						<line number="423" hits="0"/>
+						<line number="424" hits="0"/>
+						<line number="425" hits="0"/>
+						<line number="427" hits="0"/>
+						<line number="434" hits="0"/>
+						<line number="435" hits="0"/>
+						<line number="436" hits="0"/>
+						<line number="440" hits="0"/>
+						<line number="441" hits="0"/>
+						<line number="442" hits="0"/>
+						<line number="443" hits="0"/>
+						<line number="446" hits="0"/>
+						<line number="447" hits="0"/>
+						<line number="451" hits="0"/>
+						<line number="453" hits="0"/>
+						<line number="456" hits="0"/>
+						<line number="457" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.livestream" line-rate="0.4658" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/livestream/__init__.py" complexity="0" line-rate="0.9444" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/livestream/crud.py" complexity="0" line-rate="0.3016" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="0"/>
+						<line number="12" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="0"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="0"/>
+						<line number="74" hits="1"/>
+						<line number="81" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="91" hits="1"/>
+						<line number="99" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="127" hits="1"/>
+						<line number="128" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="0"/>
+						<line number="147" hits="1"/>
+						<line number="148" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="180" hits="1"/>
+						<line number="181" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="191" hits="1"/>
+						<line number="192" hits="0"/>
+						<line number="199" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="extensions/livestream/lnurl.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="106" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/livestream/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="16" hits="0"/>
+						<line number="28" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/livestream/models.py" complexity="0" line-rate="0.6557" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="72" hits="1"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/livestream/tasks.py" complexity="0" line-rate="0.4242" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="84" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/livestream/views.py" complexity="0" line-rate="0.6" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="44" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/livestream/views_api.py" complexity="0" line-rate="0.3846" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.lnaddress" line-rate="0.4324" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/lnaddress/__init__.py" complexity="0" line-rate="0.9375" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="0"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+					</lines>
+				</class>
+				<class name="cloudflare.py" filename="extensions/lnaddress/cloudflare.py" complexity="0" line-rate="0.2174" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/lnaddress/crud.py" complexity="0" line-rate="0.275" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="70" hits="1"/>
+						<line number="73" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="105" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="115" hits="0"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="147" hits="1"/>
+						<line number="148" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="151" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="164" hits="1"/>
+						<line number="165" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="172" hits="1"/>
+						<line number="174" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="180" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="186" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="191" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="196" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="extensions/lnaddress/lnurl.py" complexity="0" line-rate="0.4359" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="88" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/lnaddress/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="0"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/lnaddress/models.py" complexity="0" line-rate="0.913" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="57" hits="0"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/lnaddress/tasks.py" complexity="0" line-rate="0.3667" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="0"/>
+						<line number="20" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="61" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/lnaddress/views.py" complexity="0" line-rate="0.68" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/lnaddress/views_api.py" complexity="0" line-rate="0.2807" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="106" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="114" hits="1"/>
+						<line number="115" hits="1"/>
+						<line number="116" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="1"/>
+						<line number="123" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="139" hits="1"/>
+						<line number="140" hits="1"/>
+						<line number="141" hits="1"/>
+						<line number="144" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="162" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="171" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="176" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="202" hits="0"/>
+						<line number="203" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="210" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="218" hits="0"/>
+						<line number="219" hits="0"/>
+						<line number="224" hits="0"/>
+						<line number="227" hits="1"/>
+						<line number="228" hits="1"/>
+						<line number="229" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="231" hits="0"/>
+						<line number="232" hits="0"/>
+						<line number="233" hits="0"/>
+						<line number="234" hits="0"/>
+						<line number="235" hits="0"/>
+						<line number="237" hits="0"/>
+						<line number="238" hits="0"/>
+						<line number="240" hits="0"/>
+						<line number="243" hits="1"/>
+						<line number="244" hits="1"/>
+						<line number="245" hits="0"/>
+						<line number="246" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="250" hits="0"/>
+						<line number="251" hits="0"/>
+						<line number="255" hits="0"/>
+						<line number="256" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.lndhub" line-rate="0.6475" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/lndhub/__init__.py" complexity="0" line-rate="0.9091" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+					</lines>
+				</class>
+				<class name="decorators.py" filename="extensions/lndhub/decorators.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="31" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="42" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/lndhub/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="0"/>
+					</lines>
+				</class>
+				<class name="utils.py" filename="extensions/lndhub/utils.py" complexity="0" line-rate="0.6667" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="0"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/lndhub/views.py" complexity="0" line-rate="0.875" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/lndhub/views_api.py" complexity="0" line-rate="0.6234" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="110" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="114" hits="0"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="123" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="165" hits="1"/>
+						<line number="166" hits="1"/>
+						<line number="171" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="186" hits="0"/>
+						<line number="215" hits="1"/>
+						<line number="216" hits="1"/>
+						<line number="218" hits="0"/>
+						<line number="221" hits="1"/>
+						<line number="222" hits="1"/>
+						<line number="224" hits="0"/>
+						<line number="227" hits="1"/>
+						<line number="228" hits="1"/>
+						<line number="229" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="233" hits="1"/>
+						<line number="234" hits="1"/>
+						<line number="236" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.lnticket" line-rate="0.4539" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/lnticket/__init__.py" complexity="0" line-rate="0.9333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="0"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/lnticket/crud.py" complexity="0" line-rate="0.2581" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="0"/>
+						<line number="110" hits="1"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="134" hits="1"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="144" hits="1"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="149" hits="1"/>
+						<line number="150" hits="0"/>
+						<line number="151" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="161" hits="1"/>
+						<line number="162" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/lnticket/migrations.py" complexity="0" line-rate="0.1111" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="0"/>
+						<line number="19" hits="0"/>
+						<line number="37" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="87" hits="1"/>
+						<line number="89" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="133" hits="1"/>
+						<line number="135" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="162" hits="0"/>
+						<line number="177" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/lnticket/models.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/lnticket/tasks.py" complexity="0" line-rate="0.5263" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="0"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/lnticket/views.py" complexity="0" line-rate="0.7391" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/lnticket/views_api.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="91" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="1"/>
+						<line number="137" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="150" hits="1"/>
+						<line number="151" hits="1"/>
+						<line number="152" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="162" hits="0"/>
+						<line number="163" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.lnurldevice" line-rate="0.4315" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/lnurldevice/__init__.py" complexity="0" line-rate="0.9" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/lnurldevice/crud.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="0"/>
+						<line number="15" hits="0"/>
+						<line number="16" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="0"/>
+						<line number="83" hits="1"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="108" hits="1"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="123" hits="1"/>
+						<line number="124" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="0"/>
+						<line number="136" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="extensions/lnurldevice/lnurl.py" complexity="0" line-rate="0.1875" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="84" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="170" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="181" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="191" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="202" hits="0"/>
+						<line number="204" hits="0"/>
+						<line number="211" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="225" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/lnurldevice/migrations.py" complexity="0" line-rate="0.3077" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="10" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="39" hits="1"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/lnurldevice/models.py" complexity="0" line-rate="0.8837" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/lnurldevice/views.py" complexity="0" line-rate="0.6" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="28" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/lnurldevice/views_api.py" complexity="0" line-rate="0.5111" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="79" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="88" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.lnurlp" line-rate="0.468" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/lnurlp/__init__.py" complexity="0" line-rate="0.9444" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/lnurlp/crud.py" complexity="0" line-rate="0.2857" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="0"/>
+						<line number="12" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="extensions/lnurlp/lnurl.py" complexity="0" line-rate="0.2979" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="107" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/lnurlp/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="19" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="38" hits="1"/>
+						<line number="43" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="60" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/lnurlp/models.py" complexity="0" line-rate="0.6964" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="0"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/lnurlp/tasks.py" complexity="0" line-rate="0.4643" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/lnurlp/views.py" complexity="0" line-rate="0.6071" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="0"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/lnurlp/views_api.py" complexity="0" line-rate="0.3623" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="0"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="57" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="124" hits="1"/>
+						<line number="125" hits="1"/>
+						<line number="126" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="142" hits="1"/>
+						<line number="143" hits="1"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="149" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.offlineshop" line-rate="0.4917" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/offlineshop/__init__.py" complexity="0" line-rate="0.9167" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/offlineshop/crud.py" complexity="0" line-rate="0.3684" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="0"/>
+						<line number="12" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="54" hits="1"/>
+						<line number="63" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="1"/>
+						<line number="83" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="111" hits="1"/>
+						<line number="112" hits="0"/>
+					</lines>
+				</class>
+				<class name="helpers.py" filename="extensions/offlineshop/helpers.py" complexity="0" line-rate="0.4615" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="10" hits="0"/>
+						<line number="11" hits="0"/>
+						<line number="12" hits="0"/>
+						<line number="13" hits="0"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="extensions/offlineshop/lnurl.py" complexity="0" line-rate="0.3095" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="90" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/offlineshop/migrations.py" complexity="0" line-rate="0.4" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="16" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="37" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/offlineshop/models.py" complexity="0" line-rate="0.5222" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="0"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="0"/>
+						<line number="105" hits="1"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="112" hits="1"/>
+						<line number="113" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="120" hits="1"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="126" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/offlineshop/views.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="78" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/offlineshop/views_api.py" complexity="0" line-rate="0.5645" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="105" hits="1"/>
+						<line number="108" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="121" hits="0"/>
+					</lines>
+				</class>
+				<class name="wordlists.py" filename="extensions/offlineshop/wordlists.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.paywall" line-rate="0.5352" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/paywall/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/paywall/crud.py" complexity="0" line-rate="0.381" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="0"/>
+						<line number="11" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/paywall/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="22" hits="1"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="63" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/paywall/models.py" complexity="0" line-rate="0.871" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/paywall/views.py" complexity="0" line-rate="0.7059" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="0"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="28" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/paywall/views_api.py" complexity="0" line-rate="0.3393" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.satsdice" line-rate="0.4799" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/satsdice/__init__.py" complexity="0" line-rate="0.9" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/satsdice/crud.py" complexity="0" line-rate="0.2316" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="0"/>
+						<line number="110" hits="1"/>
+						<line number="111" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="137" hits="1"/>
+						<line number="140" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="156" hits="1"/>
+						<line number="157" hits="0"/>
+						<line number="180" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="185" hits="1"/>
+						<line number="186" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="193" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="199" hits="1"/>
+						<line number="202" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="206" hits="0"/>
+						<line number="208" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="210" hits="0"/>
+						<line number="211" hits="0"/>
+						<line number="212" hits="0"/>
+						<line number="215" hits="1"/>
+						<line number="218" hits="0"/>
+						<line number="219" hits="0"/>
+						<line number="221" hits="0"/>
+						<line number="222" hits="0"/>
+						<line number="227" hits="0"/>
+						<line number="230" hits="1"/>
+						<line number="233" hits="0"/>
+						<line number="234" hits="0"/>
+						<line number="238" hits="0"/>
+						<line number="241" hits="0"/>
+						<line number="244" hits="1"/>
+						<line number="245" hits="0"/>
+						<line number="250" hits="1"/>
+						<line number="251" hits="0"/>
+						<line number="261" hits="0"/>
+						<line number="262" hits="0"/>
+						<line number="265" hits="1"/>
+						<line number="266" hits="0"/>
+						<line number="269" hits="0"/>
+						<line number="272" hits="0"/>
+						<line number="273" hits="0"/>
+						<line number="274" hits="0"/>
+						<line number="276" hits="0"/>
+						<line number="277" hits="0"/>
+						<line number="278" hits="0"/>
+						<line number="280" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="extensions/satsdice/lnurl.py" complexity="0" line-rate="0.339" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="101" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="130" hits="1"/>
+						<line number="135" hits="1"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="157" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/satsdice/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="49" hits="0"/>
+						<line number="62" hits="1"/>
+						<line number="66" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/satsdice/models.py" complexity="0" line-rate="0.8681" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="0"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="0"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="0"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="1"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="1"/>
+						<line number="110" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="112" hits="1"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="1"/>
+						<line number="123" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="125" hits="1"/>
+						<line number="126" hits="1"/>
+						<line number="127" hits="1"/>
+						<line number="130" hits="1"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="1"/>
+						<line number="133" hits="1"/>
+						<line number="134" hits="1"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="1"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/satsdice/views.py" complexity="0" line-rate="0.434" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="122" hits="1"/>
+						<line number="123" hits="1"/>
+						<line number="124" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="130" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/satsdice/views_api.py" complexity="0" line-rate="0.386" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="100" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="120" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.satspay" line-rate="0.5413" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/satspay/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/satspay/crud.py" complexity="0" line-rate="0.2692" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="0"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/satspay/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="6" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/satspay/models.py" complexity="0" line-rate="0.8085" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="0"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="57" hits="0"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/satspay/tasks.py" complexity="0" line-rate="0.5263" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="0"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/satspay/views.py" complexity="0" line-rate="0.6538" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="40" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/satspay/views_api.py" complexity="0" line-rate="0.4" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="71" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="112" hits="1"/>
+						<line number="113" hits="1"/>
+						<line number="114" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.scrub" line-rate="0.5172" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/scrub/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/scrub/crud.py" complexity="0" line-rate="0.3438" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="0"/>
+						<line number="11" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="0"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="0"/>
+						<line number="80" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/scrub/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/scrub/models.py" complexity="0" line-rate="0.8" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/scrub/tasks.py" complexity="0" line-rate="0.4" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="81" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/scrub/views.py" complexity="0" line-rate="0.9091" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/scrub/views_api.py" complexity="0" line-rate="0.3846" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.splitpayments" line-rate="0.5827" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/splitpayments/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/splitpayments/crud.py" complexity="0" line-rate="0.4545" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="0"/>
+						<line number="11" hits="0"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="0"/>
+						<line number="16" hits="0"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/splitpayments/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="19" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="54" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/splitpayments/models.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/splitpayments/tasks.py" complexity="0" line-rate="0.4375" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/splitpayments/views.py" complexity="0" line-rate="0.9091" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/splitpayments/views_api.py" complexity="0" line-rate="0.3824" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="0"/>
+						<line number="18" hits="0"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.streamalerts" line-rate="0.4104" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/streamalerts/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/streamalerts/crud.py" complexity="0" line-rate="0.2222" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="0"/>
+						<line number="18" hits="0"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="23" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="39" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="74" hits="1"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="111" hits="1"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="153" hits="1"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="171" hits="1"/>
+						<line number="173" hits="0"/>
+						<line number="176" hits="0"/>
+						<line number="179" hits="1"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="186" hits="0"/>
+						<line number="193" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="197" hits="0"/>
+						<line number="200" hits="1"/>
+						<line number="207" hits="0"/>
+						<line number="208" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="213" hits="0"/>
+						<line number="216" hits="1"/>
+						<line number="218" hits="0"/>
+						<line number="219" hits="0"/>
+						<line number="222" hits="0"/>
+						<line number="223" hits="0"/>
+						<line number="226" hits="1"/>
+						<line number="228" hits="0"/>
+						<line number="231" hits="0"/>
+						<line number="234" hits="1"/>
+						<line number="236" hits="0"/>
+						<line number="239" hits="0"/>
+						<line number="242" hits="1"/>
+						<line number="244" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="248" hits="1"/>
+						<line number="250" hits="0"/>
+						<line number="251" hits="0"/>
+						<line number="255" hits="0"/>
+						<line number="258" hits="0"/>
+						<line number="259" hits="0"/>
+						<line number="262" hits="1"/>
+						<line number="264" hits="0"/>
+						<line number="265" hits="0"/>
+						<line number="269" hits="0"/>
+						<line number="272" hits="0"/>
+						<line number="273" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/streamalerts/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="0"/>
+						<line number="20" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/streamalerts/models.py" complexity="0" line-rate="0.9556" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/streamalerts/views.py" complexity="0" line-rate="0.75" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="34" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/streamalerts/views_api.py" complexity="0" line-rate="0.2869" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="142" hits="1"/>
+						<line number="143" hits="1"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="157" hits="1"/>
+						<line number="158" hits="1"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="162" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="168" hits="1"/>
+						<line number="169" hits="1"/>
+						<line number="173" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="176" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="181" hits="1"/>
+						<line number="182" hits="1"/>
+						<line number="186" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="199" hits="0"/>
+						<line number="201" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="208" hits="1"/>
+						<line number="209" hits="1"/>
+						<line number="213" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="216" hits="0"/>
+						<line number="217" hits="0"/>
+						<line number="221" hits="0"/>
+						<line number="222" hits="0"/>
+						<line number="226" hits="0"/>
+						<line number="228" hits="0"/>
+						<line number="231" hits="0"/>
+						<line number="234" hits="1"/>
+						<line number="235" hits="1"/>
+						<line number="237" hits="0"/>
+						<line number="238" hits="0"/>
+						<line number="239" hits="0"/>
+						<line number="242" hits="0"/>
+						<line number="243" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="248" hits="0"/>
+						<line number="251" hits="1"/>
+						<line number="252" hits="1"/>
+						<line number="254" hits="0"/>
+						<line number="255" hits="0"/>
+						<line number="256" hits="0"/>
+						<line number="259" hits="0"/>
+						<line number="260" hits="0"/>
+						<line number="264" hits="0"/>
+						<line number="265" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.subdomains" line-rate="0.4781" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/subdomains/__init__.py" complexity="0" line-rate="0.9333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="0"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+					</lines>
+				</class>
+				<class name="cloudflare.py" filename="extensions/subdomains/cloudflare.py" complexity="0" line-rate="0.2083" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="13" hits="0"/>
+						<line number="18" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/subdomains/crud.py" complexity="0" line-rate="0.2632" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="0"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="141" hits="1"/>
+						<line number="142" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="148" hits="1"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="160" hits="1"/>
+						<line number="161" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/subdomains/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="0"/>
+						<line number="23" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/subdomains/models.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/subdomains/tasks.py" complexity="0" line-rate="0.4583" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="0"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/subdomains/views.py" complexity="0" line-rate="0.7143" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="0"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="36" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/subdomains/views_api.py" complexity="0" line-rate="0.3023" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="87" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="160" hits="1"/>
+						<line number="161" hits="1"/>
+						<line number="162" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="167" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="175" hits="1"/>
+						<line number="176" hits="1"/>
+						<line number="177" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="180" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.tipjar" line-rate="0.4979" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/tipjar/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/tipjar/crud.py" complexity="0" line-rate="0.2885" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="14" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="34" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="63" hits="1"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="69" hits="1"/>
+						<line number="71" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="77" hits="1"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="85" hits="1"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="91" hits="1"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="97" hits="1"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="103" hits="1"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="114" hits="1"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+					</lines>
+				</class>
+				<class name="helpers.py" filename="extensions/tipjar/helpers.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="10" hits="0"/>
+						<line number="11" hits="0"/>
+						<line number="12" hits="0"/>
+						<line number="20" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/tipjar/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="0"/>
+						<line number="15" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/tipjar/models.py" complexity="0" line-rate="0.96" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/tipjar/views.py" complexity="0" line-rate="0.75" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="0"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="34" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/tipjar/views_api.py" complexity="0" line-rate="0.2979" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="0"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="109" hits="1"/>
+						<line number="110" hits="1"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="136" hits="1"/>
+						<line number="137" hits="1"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="162" hits="1"/>
+						<line number="163" hits="1"/>
+						<line number="167" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="173" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="182" hits="1"/>
+						<line number="183" hits="1"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="198" hits="0"/>
+						<line number="200" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.tpos" line-rate="0.568" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/tpos/__init__.py" complexity="0" line-rate="0.9333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="0"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/tpos/crud.py" complexity="0" line-rate="0.381" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="0"/>
+						<line number="11" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/tpos/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="17" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="28" hits="1"/>
+						<line number="32" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/tpos/models.py" complexity="0" line-rate="0.9474" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+					</lines>
+				</class>
+				<class name="tasks.py" filename="extensions/tpos/tasks.py" complexity="0" line-rate="0.4815" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/tpos/views.py" complexity="0" line-rate="0.6667" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="52" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/tpos/views_api.py" complexity="0" line-rate="0.4074" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="82" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.usermanager" line-rate="0.5796" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/usermanager/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/usermanager/crud.py" complexity="0" line-rate="0.3191" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="78" hits="1"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="115" hits="1"/>
+						<line number="116" hits="0"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/usermanager/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="20" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/usermanager/models.py" complexity="0" line-rate="0.9667" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/usermanager/views.py" complexity="0" line-rate="0.8889" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/usermanager/views_api.py" complexity="0" line-rate="0.5085" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="89" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="105" hits="0"/>
+						<line number="108" hits="1"/>
+						<line number="109" hits="1"/>
+						<line number="112" hits="0"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.watchonly" line-rate="0.3894" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/watchonly/__init__.py" complexity="0" line-rate="0.9091" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/watchonly/crud.py" complexity="0" line-rate="0.2727" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="0"/>
+						<line number="15" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="0"/>
+						<line number="80" hits="1"/>
+						<line number="82" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="115" hits="1"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="161" hits="1"/>
+						<line number="162" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="168" hits="1"/>
+						<line number="171" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="185" hits="1"/>
+						<line number="186" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="197" hits="1"/>
+						<line number="198" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="204" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="208" hits="1"/>
+						<line number="209" hits="0"/>
+						<line number="213" hits="1"/>
+						<line number="214" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="222" hits="0"/>
+						<line number="225" hits="0"/>
+						<line number="228" hits="1"/>
+						<line number="229" hits="0"/>
+						<line number="233" hits="0"/>
+						<line number="236" hits="0"/>
+						<line number="239" hits="1"/>
+						<line number="240" hits="0"/>
+						<line number="243" hits="0"/>
+					</lines>
+				</class>
+				<class name="helpers.py" filename="extensions/watchonly/helpers.py" complexity="0" line-rate="0.12" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="0"/>
+						<line number="8" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="11" hits="0"/>
+						<line number="12" hits="0"/>
+						<line number="15" hits="1"/>
+						<line number="19" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/watchonly/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="18" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="39" hits="1"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="56" hits="1"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="67" hits="1"/>
+						<line number="73" hits="0"/>
+						<line number="81" hits="1"/>
+						<line number="86" hits="0"/>
+						<line number="91" hits="1"/>
+						<line number="95" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/watchonly/models.py" complexity="0" line-rate="0.9722" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/watchonly/views.py" complexity="0" line-rate="0.9091" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/watchonly/views_api.py" complexity="0" line-rate="0.2203" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="63" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="128" hits="1"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="146" hits="1"/>
+						<line number="147" hits="1"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="152" hits="1"/>
+						<line number="153" hits="1"/>
+						<line number="156" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="181" hits="1"/>
+						<line number="182" hits="1"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="193" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="197" hits="0"/>
+						<line number="198" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="203" hits="0"/>
+						<line number="207" hits="0"/>
+						<line number="208" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="210" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="216" hits="0"/>
+						<line number="217" hits="0"/>
+						<line number="224" hits="0"/>
+						<line number="225" hits="0"/>
+						<line number="231" hits="1"/>
+						<line number="232" hits="1"/>
+						<line number="235" hits="0"/>
+						<line number="236" hits="0"/>
+						<line number="239" hits="0"/>
+						<line number="244" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="246" hits="0"/>
+						<line number="248" hits="0"/>
+						<line number="250" hits="0"/>
+						<line number="251" hits="0"/>
+						<line number="252" hits="0"/>
+						<line number="253" hits="0"/>
+						<line number="254" hits="0"/>
+						<line number="255" hits="0"/>
+						<line number="258" hits="0"/>
+						<line number="265" hits="0"/>
+						<line number="266" hits="0"/>
+						<line number="268" hits="0"/>
+						<line number="269" hits="0"/>
+						<line number="270" hits="0"/>
+						<line number="271" hits="0"/>
+						<line number="273" hits="0"/>
+						<line number="274" hits="0"/>
+						<line number="275" hits="0"/>
+						<line number="276" hits="0"/>
+						<line number="277" hits="0"/>
+						<line number="278" hits="0"/>
+						<line number="279" hits="0"/>
+						<line number="280" hits="0"/>
+						<line number="283" hits="0"/>
+						<line number="285" hits="0"/>
+						<line number="286" hits="0"/>
+						<line number="288" hits="0"/>
+						<line number="290" hits="0"/>
+						<line number="291" hits="0"/>
+						<line number="294" hits="1"/>
+						<line number="295" hits="1"/>
+						<line number="298" hits="0"/>
+						<line number="299" hits="0"/>
+						<line number="300" hits="0"/>
+						<line number="301" hits="0"/>
+						<line number="302" hits="0"/>
+						<line number="304" hits="0"/>
+						<line number="305" hits="0"/>
+						<line number="306" hits="0"/>
+						<line number="307" hits="0"/>
+						<line number="309" hits="0"/>
+						<line number="310" hits="0"/>
+						<line number="317" hits="0"/>
+						<line number="318" hits="0"/>
+						<line number="321" hits="0"/>
+						<line number="322" hits="0"/>
+						<line number="323" hits="0"/>
+						<line number="324" hits="0"/>
+						<line number="327" hits="1"/>
+						<line number="328" hits="1"/>
+						<line number="331" hits="0"/>
+						<line number="332" hits="0"/>
+						<line number="333" hits="0"/>
+						<line number="334" hits="0"/>
+						<line number="338" hits="0"/>
+						<line number="343" hits="0"/>
+						<line number="344" hits="0"/>
+						<line number="345" hits="0"/>
+						<line number="346" hits="0"/>
+						<line number="347" hits="0"/>
+						<line number="349" hits="0"/>
+						<line number="350" hits="0"/>
+						<line number="351" hits="0"/>
+						<line number="357" hits="1"/>
+						<line number="358" hits="1"/>
+						<line number="361" hits="0"/>
+						<line number="362" hits="0"/>
+						<line number="365" hits="1"/>
+						<line number="366" hits="1"/>
+						<line number="367" hits="0"/>
+						<line number="368" hits="0"/>
+						<line number="369" hits="0"/>
+						<line number="370" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="extensions.withdraw" line-rate="0.3743" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="extensions/withdraw/__init__.py" complexity="0" line-rate="0.9167" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+					</lines>
+				</class>
+				<class name="crud.py" filename="extensions/withdraw/crud.py" complexity="0" line-rate="0.2456" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="13" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="107" hits="1"/>
+						<line number="108" hits="0"/>
+						<line number="111" hits="1"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="116" hits="1"/>
+						<line number="117" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="146" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnurl.py" filename="extensions/withdraw/lnurl.py" complexity="0" line-rate="0.2273" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="152" hits="1"/>
+						<line number="157" hits="1"/>
+						<line number="158" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="171" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="173" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="191" hits="0"/>
+					</lines>
+				</class>
+				<class name="migrations.py" filename="extensions/withdraw/migrations.py" complexity="0" line-rate="0.2632" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="5" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="99" hits="1"/>
+						<line number="103" hits="0"/>
+						<line number="113" hits="1"/>
+						<line number="117" hits="0"/>
+						<line number="120" hits="1"/>
+						<line number="124" hits="0"/>
+					</lines>
+				</class>
+				<class name="models.py" filename="extensions/withdraw/models.py" complexity="0" line-rate="0.7925" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="0"/>
+					</lines>
+				</class>
+				<class name="views.py" filename="extensions/withdraw/views.py" complexity="0" line-rate="0.3194" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="1"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="149" hits="0"/>
+					</lines>
+				</class>
+				<class name="views_api.py" filename="extensions/withdraw/views_api.py" complexity="0" line-rate="0.3385" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="116" hits="1"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="134" hits="1"/>
+						<line number="135" hits="1"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="utils" line-rate="0.8644" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="utils/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
+				<class name="exchange_rates.py" filename="utils/exchange_rates.py" complexity="0" line-rate="0.8644" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="176" hits="1"/>
+						<line number="177" hits="1"/>
+						<line number="178" hits="1"/>
+						<line number="179" hits="1"/>
+						<line number="180" hits="1"/>
+						<line number="183" hits="1"/>
+						<line number="223" hits="1"/>
+						<line number="224" hits="1"/>
+						<line number="230" hits="1"/>
+						<line number="231" hits="1"/>
+						<line number="233" hits="1"/>
+						<line number="235" hits="1"/>
+						<line number="236" hits="1"/>
+						<line number="238" hits="1"/>
+						<line number="239" hits="1"/>
+						<line number="240" hits="1"/>
+						<line number="242" hits="0"/>
+						<line number="244" hits="1"/>
+						<line number="245" hits="1"/>
+						<line number="246" hits="1"/>
+						<line number="247" hits="1"/>
+						<line number="248" hits="1"/>
+						<line number="249" hits="0"/>
+						<line number="250" hits="0"/>
+						<line number="251" hits="0"/>
+						<line number="253" hits="1"/>
+						<line number="254" hits="1"/>
+						<line number="255" hits="1"/>
+						<line number="256" hits="1"/>
+						<line number="257" hits="1"/>
+						<line number="258" hits="1"/>
+						<line number="259" hits="1"/>
+						<line number="260" hits="1"/>
+						<line number="261" hits="1"/>
+						<line number="262" hits="1"/>
+						<line number="270" hits="0"/>
+						<line number="272" hits="1"/>
+						<line number="273" hits="1"/>
+						<line number="274" hits="1"/>
+						<line number="276" hits="1"/>
+						<line number="277" hits="1"/>
+						<line number="278" hits="1"/>
+						<line number="279" hits="1"/>
+						<line number="281" hits="1"/>
+						<line number="282" hits="0"/>
+						<line number="283" hits="1"/>
+						<line number="284" hits="0"/>
+						<line number="286" hits="1"/>
+						<line number="289" hits="1"/>
+						<line number="290" hits="1"/>
+						<line number="293" hits="1"/>
+						<line number="294" hits="1"/>
+						<line number="297" hits="1"/>
+						<line number="298" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="wallets" line-rate="0.2605" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="wallets/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+					</lines>
+				</class>
+				<class name="base.py" filename="wallets/base.py" complexity="0" line-rate="0.717" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="60" hits="0"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="66" hits="0"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="72" hits="0"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="0"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+					</lines>
+				</class>
+				<class name="cliche.py" filename="wallets/cliche.py" complexity="0" line-rate="0.1828" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="116" hits="1"/>
+						<line number="117" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+					</lines>
+				</class>
+				<class name="cln.py" filename="wallets/cln.py" complexity="0" line-rate="0.2212" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="0"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="1"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="115" hits="1"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="146" hits="1"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="151" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="154" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="162" hits="1"/>
+						<line number="164" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="167" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="173" hits="0"/>
+					</lines>
+				</class>
+				<class name="eclair.py" filename="wallets/eclair.py" complexity="0" line-rate="0.2202" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="67" hits="1"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="146" hits="1"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="163" hits="1"/>
+						<line number="164" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="171" hits="0"/>
+						<line number="173" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="176" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="181" hits="1"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="193" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="201" hits="0"/>
+						<line number="204" hits="0"/>
+						<line number="205" hits="0"/>
+					</lines>
+				</class>
+				<class name="fake.py" filename="wallets/fake.py" complexity="0" line-rate="0.7609" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="0"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="0"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnbits.py" filename="wallets/lnbits.py" complexity="0" line-rate="0.1975" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="104" hits="1"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="128" hits="1"/>
+						<line number="129" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="153" hits="0"/>
+					</lines>
+				</class>
+				<class name="lndgrpc.py" filename="wallets/lndgrpc.py" complexity="0" line-rate="0.194" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="0"/>
+						<line number="5" hits="0"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="0"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="0"/>
+						<line number="79" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="0"/>
+						<line number="122" hits="1"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="132" hits="1"/>
+						<line number="138" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="151" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="159" hits="1"/>
+						<line number="161" hits="0"/>
+						<line number="167" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="171" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="186" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="194" hits="1"/>
+						<line number="195" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="197" hits="0"/>
+						<line number="198" hits="0"/>
+						<line number="199" hits="0"/>
+						<line number="202" hits="0"/>
+						<line number="204" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="206" hits="0"/>
+						<line number="208" hits="0"/>
+						<line number="210" hits="1"/>
+						<line number="214" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="216" hits="0"/>
+						<line number="217" hits="0"/>
+						<line number="218" hits="0"/>
+						<line number="221" hits="0"/>
+						<line number="225" hits="0"/>
+						<line number="226" hits="0"/>
+						<line number="228" hits="0"/>
+						<line number="234" hits="0"/>
+						<line number="240" hits="0"/>
+						<line number="241" hits="0"/>
+						<line number="242" hits="0"/>
+						<line number="243" hits="0"/>
+						<line number="244" hits="0"/>
+						<line number="246" hits="0"/>
+						<line number="248" hits="1"/>
+						<line number="250" hits="0"/>
+						<line number="251" hits="0"/>
+						<line number="252" hits="0"/>
+						<line number="253" hits="0"/>
+						<line number="254" hits="0"/>
+						<line number="256" hits="0"/>
+						<line number="257" hits="0"/>
+						<line number="258" hits="0"/>
+						<line number="259" hits="0"/>
+						<line number="262" hits="0"/>
+					</lines>
+				</class>
+				<class name="lndrest.py" filename="wallets/lndrest.py" complexity="0" line-rate="0.177" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="71" hits="1"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="105" hits="1"/>
+						<line number="106" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="144" hits="1"/>
+						<line number="148" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="162" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="167" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="173" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="183" hits="1"/>
+						<line number="184" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="191" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="193" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="197" hits="0"/>
+						<line number="198" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="201" hits="0"/>
+						<line number="202" hits="0"/>
+						<line number="203" hits="0"/>
+						<line number="206" hits="0"/>
+					</lines>
+				</class>
+				<class name="lnpay.py" filename="wallets/lnpay.py" complexity="0" line-rate="0.2289" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="0"/>
+						<line number="109" hits="1"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="122" hits="1"/>
+						<line number="123" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="128" hits="1"/>
+						<line number="129" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="151" hits="0"/>
+					</lines>
+				</class>
+				<class name="lntxbot.py" filename="wallets/lntxbot.py" complexity="0" line-rate="0.1818" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="105" hits="1"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="134" hits="1"/>
+						<line number="135" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="152" hits="0"/>
+					</lines>
+				</class>
+				<class name="opennode.py" filename="wallets/opennode.py" complexity="0" line-rate="0.2436" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="52" hits="1"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="111" hits="1"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="129" hits="1"/>
+						<line number="130" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+					</lines>
+				</class>
+				<class name="spark.py" filename="wallets/spark.py" complexity="0" line-rate="0.1667" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="91" hits="1"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="120" hits="1"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="151" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="162" hits="1"/>
+						<line number="163" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="171" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="176" hits="1"/>
+						<line number="178" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="180" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="186" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="191" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="193" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="197" hits="0"/>
+						<line number="198" hits="0"/>
+						<line number="199" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="202" hits="1"/>
+						<line number="203" hits="0"/>
+						<line number="206" hits="0"/>
+						<line number="207" hits="0"/>
+						<line number="208" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="210" hits="0"/>
+						<line number="211" hits="0"/>
+						<line number="212" hits="0"/>
+						<line number="213" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="221" hits="0"/>
+						<line number="223" hits="0"/>
+						<line number="224" hits="0"/>
+					</lines>
+				</class>
+				<class name="void.py" filename="wallets/void.py" complexity="0" line-rate="0.5882" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="22" hits="0"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="0"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="0"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="wallets.lnd_grpc_files" line-rate="0" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="wallets/lnd_grpc_files/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
+				<class name="lightning_pb2.py" filename="wallets/lnd_grpc_files/lightning_pb2.py" complexity="0" line-rate="0" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="4" hits="0"/>
+						<line number="5" hits="0"/>
+						<line number="6" hits="0"/>
+						<line number="7" hits="0"/>
+						<line number="8" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="10" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="17" hits="0"/>
+						<line number="21" hits="0"/>
+						<line number="22" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="91" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="117" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="134" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="139" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="141" hits="0"/>
+						<line number="142" hits="0"/>
+						<line number="143" hits="0"/>
+						<line number="144" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="151" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="153" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="158" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="162" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="164" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="166" hits="0"/>
+						<line number="167" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="171" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="173" hits="0"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="176" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="180" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="182" hits="0"/>
+						<line number="183" hits="0"/>
+						<line number="184" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="186" hits="0"/>
+						<line number="187" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="191" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="193" hits="0"/>
+						<line number="194" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="197" hits="0"/>
+						<line number="198" hits="0"/>
+						<line number="199" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="201" hits="0"/>
+						<line number="202" hits="0"/>
+						<line number="203" hits="0"/>
+						<line number="204" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="206" hits="0"/>
+						<line number="207" hits="0"/>
+						<line number="208" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="210" hits="0"/>
+						<line number="211" hits="0"/>
+						<line number="212" hits="0"/>
+						<line number="213" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="216" hits="0"/>
+						<line number="217" hits="0"/>
+						<line number="218" hits="0"/>
+						<line number="221" hits="0"/>
+						<line number="224" hits="0"/>
+						<line number="227" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="233" hits="0"/>
+						<line number="236" hits="0"/>
+						<line number="237" hits="0"/>
+						<line number="238" hits="0"/>
+						<line number="239" hits="0"/>
+						<line number="240" hits="0"/>
+						<line number="241" hits="0"/>
+						<line number="244" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="246" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="248" hits="0"/>
+						<line number="251" hits="0"/>
+						<line number="252" hits="0"/>
+						<line number="253" hits="0"/>
+						<line number="254" hits="0"/>
+						<line number="255" hits="0"/>
+						<line number="256" hits="0"/>
+						<line number="257" hits="0"/>
+						<line number="258" hits="0"/>
+						<line number="259" hits="0"/>
+						<line number="260" hits="0"/>
+						<line number="261" hits="0"/>
+						<line number="262" hits="0"/>
+						<line number="263" hits="0"/>
+						<line number="264" hits="0"/>
+						<line number="265" hits="0"/>
+						<line number="266" hits="0"/>
+						<line number="267" hits="0"/>
+						<line number="268" hits="0"/>
+						<line number="269" hits="0"/>
+						<line number="270" hits="0"/>
+						<line number="273" hits="0"/>
+						<line number="274" hits="0"/>
+						<line number="275" hits="0"/>
+						<line number="276" hits="0"/>
+						<line number="277" hits="0"/>
+						<line number="278" hits="0"/>
+						<line number="279" hits="0"/>
+						<line number="282" hits="0"/>
+						<line number="283" hits="0"/>
+						<line number="284" hits="0"/>
+						<line number="285" hits="0"/>
+						<line number="286" hits="0"/>
+						<line number="287" hits="0"/>
+						<line number="288" hits="0"/>
+						<line number="289" hits="0"/>
+						<line number="290" hits="0"/>
+						<line number="291" hits="0"/>
+						<line number="292" hits="0"/>
+						<line number="293" hits="0"/>
+						<line number="294" hits="0"/>
+						<line number="295" hits="0"/>
+						<line number="298" hits="0"/>
+						<line number="299" hits="0"/>
+						<line number="300" hits="0"/>
+						<line number="301" hits="0"/>
+						<line number="302" hits="0"/>
+						<line number="303" hits="0"/>
+						<line number="304" hits="0"/>
+						<line number="305" hits="0"/>
+						<line number="306" hits="0"/>
+						<line number="307" hits="0"/>
+						<line number="308" hits="0"/>
+						<line number="309" hits="0"/>
+						<line number="310" hits="0"/>
+						<line number="311" hits="0"/>
+						<line number="314" hits="0"/>
+						<line number="315" hits="0"/>
+						<line number="316" hits="0"/>
+						<line number="317" hits="0"/>
+						<line number="318" hits="0"/>
+						<line number="319" hits="0"/>
+						<line number="320" hits="0"/>
+						<line number="321" hits="0"/>
+						<line number="322" hits="0"/>
+						<line number="323" hits="0"/>
+						<line number="324" hits="0"/>
+						<line number="325" hits="0"/>
+						<line number="326" hits="0"/>
+						<line number="327" hits="0"/>
+						<line number="328" hits="0"/>
+						<line number="329" hits="0"/>
+						<line number="330" hits="0"/>
+						<line number="333" hits="0"/>
+						<line number="336" hits="0"/>
+						<line number="337" hits="0"/>
+						<line number="338" hits="0"/>
+						<line number="339" hits="0"/>
+						<line number="340" hits="0"/>
+						<line number="341" hits="0"/>
+						<line number="342" hits="0"/>
+						<line number="343" hits="0"/>
+						<line number="346" hits="0"/>
+						<line number="347" hits="0"/>
+						<line number="348" hits="0"/>
+						<line number="349" hits="0"/>
+						<line number="350" hits="0"/>
+						<line number="351" hits="0"/>
+						<line number="352" hits="0"/>
+						<line number="353" hits="0"/>
+						<line number="354" hits="0"/>
+						<line number="355" hits="0"/>
+						<line number="356" hits="0"/>
+						<line number="357" hits="0"/>
+						<line number="360" hits="0"/>
+						<line number="361" hits="0"/>
+						<line number="362" hits="0"/>
+						<line number="363" hits="0"/>
+						<line number="364" hits="0"/>
+						<line number="365" hits="0"/>
+						<line number="366" hits="0"/>
+						<line number="367" hits="0"/>
+						<line number="368" hits="0"/>
+						<line number="369" hits="0"/>
+						<line number="370" hits="0"/>
+						<line number="371" hits="0"/>
+						<line number="372" hits="0"/>
+						<line number="375" hits="0"/>
+						<line number="376" hits="0"/>
+						<line number="377" hits="0"/>
+						<line number="380" hits="0"/>
+						<line number="381" hits="0"/>
+						<line number="382" hits="0"/>
+						<line number="383" hits="0"/>
+						<line number="384" hits="0"/>
+						<line number="385" hits="0"/>
+						<line number="394" hits="0"/>
+						<line number="396" hits="0"/>
+						<line number="405" hits="0"/>
+						<line number="407" hits="0"/>
+						<line number="416" hits="0"/>
+						<line number="418" hits="0"/>
+						<line number="427" hits="0"/>
+						<line number="429" hits="0"/>
+						<line number="438" hits="0"/>
+						<line number="440" hits="0"/>
+						<line number="449" hits="0"/>
+						<line number="451" hits="0"/>
+						<line number="460" hits="0"/>
+						<line number="462" hits="0"/>
+						<line number="471" hits="0"/>
+						<line number="473" hits="0"/>
+						<line number="482" hits="0"/>
+						<line number="484" hits="0"/>
+						<line number="493" hits="0"/>
+						<line number="495" hits="0"/>
+						<line number="513" hits="0"/>
+						<line number="514" hits="0"/>
+						<line number="516" hits="0"/>
+						<line number="525" hits="0"/>
+						<line number="527" hits="0"/>
+						<line number="536" hits="0"/>
+						<line number="538" hits="0"/>
+						<line number="547" hits="0"/>
+						<line number="549" hits="0"/>
+						<line number="558" hits="0"/>
+						<line number="560" hits="0"/>
+						<line number="569" hits="0"/>
+						<line number="571" hits="0"/>
+						<line number="580" hits="0"/>
+						<line number="582" hits="0"/>
+						<line number="591" hits="0"/>
+						<line number="593" hits="0"/>
+						<line number="602" hits="0"/>
+						<line number="604" hits="0"/>
+						<line number="622" hits="0"/>
+						<line number="623" hits="0"/>
+						<line number="625" hits="0"/>
+						<line number="634" hits="0"/>
+						<line number="636" hits="0"/>
+						<line number="654" hits="0"/>
+						<line number="655" hits="0"/>
+						<line number="657" hits="0"/>
+						<line number="666" hits="0"/>
+						<line number="668" hits="0"/>
+						<line number="677" hits="0"/>
+						<line number="679" hits="0"/>
+						<line number="688" hits="0"/>
+						<line number="690" hits="0"/>
+						<line number="699" hits="0"/>
+						<line number="701" hits="0"/>
+						<line number="710" hits="0"/>
+						<line number="712" hits="0"/>
+						<line number="721" hits="0"/>
+						<line number="723" hits="0"/>
+						<line number="732" hits="0"/>
+						<line number="734" hits="0"/>
+						<line number="743" hits="0"/>
+						<line number="745" hits="0"/>
+						<line number="754" hits="0"/>
+						<line number="756" hits="0"/>
+						<line number="765" hits="0"/>
+						<line number="767" hits="0"/>
+						<line number="776" hits="0"/>
+						<line number="778" hits="0"/>
+						<line number="787" hits="0"/>
+						<line number="789" hits="0"/>
+						<line number="798" hits="0"/>
+						<line number="800" hits="0"/>
+						<line number="809" hits="0"/>
+						<line number="811" hits="0"/>
+						<line number="820" hits="0"/>
+						<line number="822" hits="0"/>
+						<line number="831" hits="0"/>
+						<line number="833" hits="0"/>
+						<line number="842" hits="0"/>
+						<line number="844" hits="0"/>
+						<line number="853" hits="0"/>
+						<line number="855" hits="0"/>
+						<line number="864" hits="0"/>
+						<line number="866" hits="0"/>
+						<line number="875" hits="0"/>
+						<line number="877" hits="0"/>
+						<line number="886" hits="0"/>
+						<line number="888" hits="0"/>
+						<line number="897" hits="0"/>
+						<line number="899" hits="0"/>
+						<line number="908" hits="0"/>
+						<line number="910" hits="0"/>
+						<line number="919" hits="0"/>
+						<line number="921" hits="0"/>
+						<line number="939" hits="0"/>
+						<line number="940" hits="0"/>
+						<line number="942" hits="0"/>
+						<line number="951" hits="0"/>
+						<line number="953" hits="0"/>
+						<line number="962" hits="0"/>
+						<line number="964" hits="0"/>
+						<line number="973" hits="0"/>
+						<line number="975" hits="0"/>
+						<line number="984" hits="0"/>
+						<line number="986" hits="0"/>
+						<line number="995" hits="0"/>
+						<line number="997" hits="0"/>
+						<line number="1006" hits="0"/>
+						<line number="1008" hits="0"/>
+						<line number="1026" hits="0"/>
+						<line number="1027" hits="0"/>
+						<line number="1029" hits="0"/>
+						<line number="1038" hits="0"/>
+						<line number="1040" hits="0"/>
+						<line number="1049" hits="0"/>
+						<line number="1051" hits="0"/>
+						<line number="1060" hits="0"/>
+						<line number="1062" hits="0"/>
+						<line number="1071" hits="0"/>
+						<line number="1073" hits="0"/>
+						<line number="1082" hits="0"/>
+						<line number="1084" hits="0"/>
+						<line number="1093" hits="0"/>
+						<line number="1095" hits="0"/>
+						<line number="1104" hits="0"/>
+						<line number="1106" hits="0"/>
+						<line number="1115" hits="0"/>
+						<line number="1117" hits="0"/>
+						<line number="1126" hits="0"/>
+						<line number="1128" hits="0"/>
+						<line number="1137" hits="0"/>
+						<line number="1139" hits="0"/>
+						<line number="1148" hits="0"/>
+						<line number="1150" hits="0"/>
+						<line number="1159" hits="0"/>
+						<line number="1161" hits="0"/>
+						<line number="1170" hits="0"/>
+						<line number="1172" hits="0"/>
+						<line number="1181" hits="0"/>
+						<line number="1183" hits="0"/>
+						<line number="1192" hits="0"/>
+						<line number="1194" hits="0"/>
+						<line number="1203" hits="0"/>
+						<line number="1205" hits="0"/>
+						<line number="1214" hits="0"/>
+						<line number="1216" hits="0"/>
+						<line number="1225" hits="0"/>
+						<line number="1227" hits="0"/>
+						<line number="1236" hits="0"/>
+						<line number="1238" hits="0"/>
+						<line number="1247" hits="0"/>
+						<line number="1249" hits="0"/>
+						<line number="1258" hits="0"/>
+						<line number="1260" hits="0"/>
+						<line number="1269" hits="0"/>
+						<line number="1271" hits="0"/>
+						<line number="1280" hits="0"/>
+						<line number="1282" hits="0"/>
+						<line number="1291" hits="0"/>
+						<line number="1293" hits="0"/>
+						<line number="1302" hits="0"/>
+						<line number="1304" hits="0"/>
+						<line number="1313" hits="0"/>
+						<line number="1315" hits="0"/>
+						<line number="1324" hits="0"/>
+						<line number="1326" hits="0"/>
+						<line number="1389" hits="0"/>
+						<line number="1390" hits="0"/>
+						<line number="1391" hits="0"/>
+						<line number="1392" hits="0"/>
+						<line number="1393" hits="0"/>
+						<line number="1394" hits="0"/>
+						<line number="1395" hits="0"/>
+						<line number="1397" hits="0"/>
+						<line number="1406" hits="0"/>
+						<line number="1408" hits="0"/>
+						<line number="1417" hits="0"/>
+						<line number="1419" hits="0"/>
+						<line number="1428" hits="0"/>
+						<line number="1430" hits="0"/>
+						<line number="1439" hits="0"/>
+						<line number="1441" hits="0"/>
+						<line number="1459" hits="0"/>
+						<line number="1460" hits="0"/>
+						<line number="1462" hits="0"/>
+						<line number="1471" hits="0"/>
+						<line number="1473" hits="0"/>
+						<line number="1482" hits="0"/>
+						<line number="1484" hits="0"/>
+						<line number="1493" hits="0"/>
+						<line number="1495" hits="0"/>
+						<line number="1513" hits="0"/>
+						<line number="1514" hits="0"/>
+						<line number="1516" hits="0"/>
+						<line number="1525" hits="0"/>
+						<line number="1527" hits="0"/>
+						<line number="1536" hits="0"/>
+						<line number="1538" hits="0"/>
+						<line number="1547" hits="0"/>
+						<line number="1549" hits="0"/>
+						<line number="1567" hits="0"/>
+						<line number="1568" hits="0"/>
+						<line number="1570" hits="0"/>
+						<line number="1579" hits="0"/>
+						<line number="1581" hits="0"/>
+						<line number="1590" hits="0"/>
+						<line number="1592" hits="0"/>
+						<line number="1601" hits="0"/>
+						<line number="1603" hits="0"/>
+						<line number="1612" hits="0"/>
+						<line number="1614" hits="0"/>
+						<line number="1623" hits="0"/>
+						<line number="1625" hits="0"/>
+						<line number="1643" hits="0"/>
+						<line number="1644" hits="0"/>
+						<line number="1646" hits="0"/>
+						<line number="1655" hits="0"/>
+						<line number="1657" hits="0"/>
+						<line number="1666" hits="0"/>
+						<line number="1668" hits="0"/>
+						<line number="1677" hits="0"/>
+						<line number="1679" hits="0"/>
+						<line number="1688" hits="0"/>
+						<line number="1690" hits="0"/>
+						<line number="1699" hits="0"/>
+						<line number="1701" hits="0"/>
+						<line number="1710" hits="0"/>
+						<line number="1712" hits="0"/>
+						<line number="1730" hits="0"/>
+						<line number="1731" hits="0"/>
+						<line number="1733" hits="0"/>
+						<line number="1742" hits="0"/>
+						<line number="1744" hits="0"/>
+						<line number="1753" hits="0"/>
+						<line number="1755" hits="0"/>
+						<line number="1764" hits="0"/>
+						<line number="1766" hits="0"/>
+						<line number="1775" hits="0"/>
+						<line number="1777" hits="0"/>
+						<line number="1786" hits="0"/>
+						<line number="1788" hits="0"/>
+						<line number="1797" hits="0"/>
+						<line number="1799" hits="0"/>
+						<line number="1808" hits="0"/>
+						<line number="1810" hits="0"/>
+						<line number="1819" hits="0"/>
+						<line number="1821" hits="0"/>
+						<line number="1839" hits="0"/>
+						<line number="1840" hits="0"/>
+						<line number="1842" hits="0"/>
+						<line number="1851" hits="0"/>
+						<line number="1853" hits="0"/>
+						<line number="1862" hits="0"/>
+						<line number="1864" hits="0"/>
+						<line number="1873" hits="0"/>
+						<line number="1875" hits="0"/>
+						<line number="1884" hits="0"/>
+						<line number="1886" hits="0"/>
+						<line number="1895" hits="0"/>
+						<line number="1897" hits="0"/>
+						<line number="1906" hits="0"/>
+						<line number="1908" hits="0"/>
+						<line number="1935" hits="0"/>
+						<line number="1936" hits="0"/>
+						<line number="1937" hits="0"/>
+						<line number="1939" hits="0"/>
+						<line number="1957" hits="0"/>
+						<line number="1958" hits="0"/>
+						<line number="1960" hits="0"/>
+						<line number="1969" hits="0"/>
+						<line number="1971" hits="0"/>
+						<line number="1980" hits="0"/>
+						<line number="1982" hits="0"/>
+						<line number="1991" hits="0"/>
+						<line number="1993" hits="0"/>
+						<line number="2002" hits="0"/>
+						<line number="2004" hits="0"/>
+						<line number="2013" hits="0"/>
+						<line number="2015" hits="0"/>
+						<line number="2024" hits="0"/>
+						<line number="2026" hits="0"/>
+						<line number="2035" hits="0"/>
+						<line number="2037" hits="0"/>
+						<line number="2046" hits="0"/>
+						<line number="2048" hits="0"/>
+						<line number="2057" hits="0"/>
+						<line number="2059" hits="0"/>
+						<line number="2068" hits="0"/>
+						<line number="2070" hits="0"/>
+						<line number="2079" hits="0"/>
+						<line number="2081" hits="0"/>
+						<line number="2090" hits="0"/>
+						<line number="2092" hits="0"/>
+						<line number="2101" hits="0"/>
+						<line number="2103" hits="0"/>
+						<line number="2112" hits="0"/>
+						<line number="2114" hits="0"/>
+						<line number="2123" hits="0"/>
+						<line number="2125" hits="0"/>
+						<line number="2134" hits="0"/>
+						<line number="2136" hits="0"/>
+						<line number="2145" hits="0"/>
+						<line number="2147" hits="0"/>
+						<line number="2156" hits="0"/>
+						<line number="2158" hits="0"/>
+						<line number="2167" hits="0"/>
+						<line number="2169" hits="0"/>
+						<line number="2187" hits="0"/>
+						<line number="2188" hits="0"/>
+						<line number="2190" hits="0"/>
+						<line number="2199" hits="0"/>
+						<line number="2201" hits="0"/>
+						<line number="2210" hits="0"/>
+						<line number="2212" hits="0"/>
+						<line number="2221" hits="0"/>
+						<line number="2223" hits="0"/>
+						<line number="2232" hits="0"/>
+						<line number="2234" hits="0"/>
+						<line number="2243" hits="0"/>
+						<line number="2245" hits="0"/>
+						<line number="2254" hits="0"/>
+						<line number="2256" hits="0"/>
+						<line number="2265" hits="0"/>
+						<line number="2267" hits="0"/>
+						<line number="2276" hits="0"/>
+						<line number="2278" hits="0"/>
+						<line number="2287" hits="0"/>
+						<line number="2289" hits="0"/>
+						<line number="2298" hits="0"/>
+						<line number="2300" hits="0"/>
+						<line number="2309" hits="0"/>
+						<line number="2311" hits="0"/>
+						<line number="2320" hits="0"/>
+						<line number="2322" hits="0"/>
+						<line number="2331" hits="0"/>
+						<line number="2333" hits="0"/>
+						<line number="2342" hits="0"/>
+						<line number="2344" hits="0"/>
+						<line number="2353" hits="0"/>
+						<line number="2355" hits="0"/>
+						<line number="2364" hits="0"/>
+						<line number="2366" hits="0"/>
+						<line number="2375" hits="0"/>
+						<line number="2377" hits="0"/>
+						<line number="2386" hits="0"/>
+						<line number="2388" hits="0"/>
+						<line number="2397" hits="0"/>
+						<line number="2399" hits="0"/>
+						<line number="2408" hits="0"/>
+						<line number="2410" hits="0"/>
+						<line number="2419" hits="0"/>
+						<line number="2421" hits="0"/>
+						<line number="2430" hits="0"/>
+						<line number="2432" hits="0"/>
+						<line number="2441" hits="0"/>
+						<line number="2443" hits="0"/>
+						<line number="2452" hits="0"/>
+						<line number="2454" hits="0"/>
+						<line number="2463" hits="0"/>
+						<line number="2465" hits="0"/>
+						<line number="2474" hits="0"/>
+						<line number="2476" hits="0"/>
+						<line number="2485" hits="0"/>
+						<line number="2487" hits="0"/>
+						<line number="2496" hits="0"/>
+						<line number="2498" hits="0"/>
+						<line number="2507" hits="0"/>
+						<line number="2509" hits="0"/>
+						<line number="2527" hits="0"/>
+						<line number="2528" hits="0"/>
+						<line number="2530" hits="0"/>
+						<line number="2539" hits="0"/>
+						<line number="2541" hits="0"/>
+						<line number="2550" hits="0"/>
+						<line number="2552" hits="0"/>
+						<line number="2561" hits="0"/>
+						<line number="2563" hits="0"/>
+						<line number="2572" hits="0"/>
+						<line number="2574" hits="0"/>
+						<line number="2583" hits="0"/>
+						<line number="2585" hits="0"/>
+						<line number="2594" hits="0"/>
+						<line number="2596" hits="0"/>
+						<line number="2605" hits="0"/>
+						<line number="2607" hits="0"/>
+						<line number="2616" hits="0"/>
+						<line number="2618" hits="0"/>
+						<line number="2627" hits="0"/>
+						<line number="2629" hits="0"/>
+						<line number="2638" hits="0"/>
+						<line number="2640" hits="0"/>
+						<line number="2649" hits="0"/>
+						<line number="2651" hits="0"/>
+						<line number="2660" hits="0"/>
+						<line number="2662" hits="0"/>
+						<line number="2663" hits="0"/>
+						<line number="2665" hits="0"/>
+						<line number="2666" hits="0"/>
+						<line number="2667" hits="0"/>
+						<line number="2668" hits="0"/>
+						<line number="2669" hits="0"/>
+						<line number="2670" hits="0"/>
+						<line number="2671" hits="0"/>
+						<line number="2672" hits="0"/>
+						<line number="2673" hits="0"/>
+						<line number="2674" hits="0"/>
+						<line number="2675" hits="0"/>
+						<line number="2676" hits="0"/>
+						<line number="2677" hits="0"/>
+						<line number="2678" hits="0"/>
+						<line number="2681" hits="0"/>
+						<line number="2682" hits="0"/>
+						<line number="2683" hits="0"/>
+						<line number="2684" hits="0"/>
+						<line number="2687" hits="0"/>
+						<line number="2688" hits="0"/>
+						<line number="2689" hits="0"/>
+						<line number="2690" hits="0"/>
+						<line number="2691" hits="0"/>
+						<line number="2692" hits="0"/>
+						<line number="2693" hits="0"/>
+						<line number="2694" hits="0"/>
+						<line number="2695" hits="0"/>
+						<line number="2696" hits="0"/>
+						<line number="2697" hits="0"/>
+						<line number="2698" hits="0"/>
+						<line number="2699" hits="0"/>
+						<line number="2700" hits="0"/>
+						<line number="2701" hits="0"/>
+						<line number="2702" hits="0"/>
+						<line number="2703" hits="0"/>
+						<line number="2704" hits="0"/>
+						<line number="2705" hits="0"/>
+						<line number="2706" hits="0"/>
+						<line number="2707" hits="0"/>
+						<line number="2708" hits="0"/>
+						<line number="2709" hits="0"/>
+						<line number="2710" hits="0"/>
+						<line number="2711" hits="0"/>
+						<line number="2712" hits="0"/>
+						<line number="2715" hits="0"/>
+						<line number="2716" hits="0"/>
+						<line number="2719" hits="0"/>
+						<line number="2720" hits="0"/>
+						<line number="2721" hits="0"/>
+						<line number="2722" hits="0"/>
+						<line number="2725" hits="0"/>
+						<line number="2726" hits="0"/>
+						<line number="2727" hits="0"/>
+						<line number="2728" hits="0"/>
+						<line number="2729" hits="0"/>
+						<line number="2730" hits="0"/>
+						<line number="2733" hits="0"/>
+						<line number="2734" hits="0"/>
+						<line number="2735" hits="0"/>
+						<line number="2736" hits="0"/>
+						<line number="2739" hits="0"/>
+						<line number="2740" hits="0"/>
+						<line number="2743" hits="0"/>
+						<line number="2744" hits="0"/>
+						<line number="2745" hits="0"/>
+						<line number="2746" hits="0"/>
+						<line number="2747" hits="0"/>
+						<line number="2748" hits="0"/>
+						<line number="2749" hits="0"/>
+						<line number="2750" hits="0"/>
+						<line number="2751" hits="0"/>
+						<line number="2752" hits="0"/>
+						<line number="2753" hits="0"/>
+						<line number="2754" hits="0"/>
+						<line number="2755" hits="0"/>
+						<line number="2756" hits="0"/>
+						<line number="2757" hits="0"/>
+						<line number="2758" hits="0"/>
+						<line number="2759" hits="0"/>
+						<line number="2760" hits="0"/>
+						<line number="2761" hits="0"/>
+						<line number="2762" hits="0"/>
+						<line number="2763" hits="0"/>
+						<line number="2764" hits="0"/>
+						<line number="2765" hits="0"/>
+						<line number="2766" hits="0"/>
+						<line number="2767" hits="0"/>
+						<line number="2768" hits="0"/>
+						<line number="2769" hits="0"/>
+						<line number="2770" hits="0"/>
+						<line number="2771" hits="0"/>
+						<line number="2772" hits="0"/>
+						<line number="2773" hits="0"/>
+						<line number="2774" hits="0"/>
+						<line number="2775" hits="0"/>
+						<line number="2776" hits="0"/>
+						<line number="2777" hits="0"/>
+						<line number="2778" hits="0"/>
+						<line number="2779" hits="0"/>
+						<line number="2780" hits="0"/>
+						<line number="2781" hits="0"/>
+						<line number="2782" hits="0"/>
+						<line number="2783" hits="0"/>
+						<line number="2784" hits="0"/>
+						<line number="2785" hits="0"/>
+						<line number="2786" hits="0"/>
+						<line number="2787" hits="0"/>
+						<line number="2788" hits="0"/>
+						<line number="2789" hits="0"/>
+						<line number="2790" hits="0"/>
+						<line number="2791" hits="0"/>
+						<line number="2792" hits="0"/>
+						<line number="2793" hits="0"/>
+						<line number="2794" hits="0"/>
+						<line number="2795" hits="0"/>
+						<line number="2796" hits="0"/>
+						<line number="2797" hits="0"/>
+						<line number="2798" hits="0"/>
+						<line number="2799" hits="0"/>
+						<line number="2800" hits="0"/>
+						<line number="2801" hits="0"/>
+						<line number="2802" hits="0"/>
+						<line number="2803" hits="0"/>
+						<line number="2804" hits="0"/>
+						<line number="2805" hits="0"/>
+						<line number="2806" hits="0"/>
+						<line number="2807" hits="0"/>
+						<line number="2808" hits="0"/>
+						<line number="2809" hits="0"/>
+						<line number="2810" hits="0"/>
+						<line number="2811" hits="0"/>
+						<line number="2812" hits="0"/>
+						<line number="2813" hits="0"/>
+						<line number="2814" hits="0"/>
+						<line number="2815" hits="0"/>
+						<line number="2816" hits="0"/>
+						<line number="2817" hits="0"/>
+						<line number="2818" hits="0"/>
+						<line number="2819" hits="0"/>
+						<line number="2820" hits="0"/>
+						<line number="2821" hits="0"/>
+						<line number="2822" hits="0"/>
+						<line number="2823" hits="0"/>
+						<line number="2824" hits="0"/>
+						<line number="2825" hits="0"/>
+						<line number="2826" hits="0"/>
+						<line number="2827" hits="0"/>
+						<line number="2828" hits="0"/>
+						<line number="2829" hits="0"/>
+						<line number="2830" hits="0"/>
+						<line number="2831" hits="0"/>
+						<line number="2832" hits="0"/>
+						<line number="2833" hits="0"/>
+						<line number="2834" hits="0"/>
+						<line number="2835" hits="0"/>
+						<line number="2836" hits="0"/>
+						<line number="2837" hits="0"/>
+						<line number="2838" hits="0"/>
+						<line number="2839" hits="0"/>
+						<line number="2840" hits="0"/>
+						<line number="2841" hits="0"/>
+						<line number="2842" hits="0"/>
+						<line number="2843" hits="0"/>
+						<line number="2844" hits="0"/>
+						<line number="2845" hits="0"/>
+						<line number="2846" hits="0"/>
+						<line number="2847" hits="0"/>
+						<line number="2848" hits="0"/>
+						<line number="2849" hits="0"/>
+						<line number="2850" hits="0"/>
+						<line number="2851" hits="0"/>
+						<line number="2852" hits="0"/>
+						<line number="2853" hits="0"/>
+						<line number="2854" hits="0"/>
+						<line number="2855" hits="0"/>
+						<line number="2856" hits="0"/>
+						<line number="2857" hits="0"/>
+						<line number="2858" hits="0"/>
+						<line number="2859" hits="0"/>
+						<line number="2860" hits="0"/>
+						<line number="2861" hits="0"/>
+						<line number="2862" hits="0"/>
+						<line number="2863" hits="0"/>
+						<line number="2864" hits="0"/>
+						<line number="2865" hits="0"/>
+						<line number="2866" hits="0"/>
+						<line number="2867" hits="0"/>
+						<line number="2868" hits="0"/>
+						<line number="2869" hits="0"/>
+						<line number="2870" hits="0"/>
+						<line number="2871" hits="0"/>
+						<line number="2872" hits="0"/>
+						<line number="2873" hits="0"/>
+						<line number="2874" hits="0"/>
+						<line number="2875" hits="0"/>
+						<line number="2876" hits="0"/>
+						<line number="2877" hits="0"/>
+						<line number="2878" hits="0"/>
+						<line number="2879" hits="0"/>
+						<line number="2880" hits="0"/>
+						<line number="2881" hits="0"/>
+						<line number="2882" hits="0"/>
+						<line number="2883" hits="0"/>
+						<line number="2884" hits="0"/>
+						<line number="2885" hits="0"/>
+						<line number="2886" hits="0"/>
+						<line number="2887" hits="0"/>
+						<line number="2888" hits="0"/>
+						<line number="2889" hits="0"/>
+						<line number="2890" hits="0"/>
+						<line number="2891" hits="0"/>
+						<line number="2892" hits="0"/>
+						<line number="2893" hits="0"/>
+						<line number="2894" hits="0"/>
+						<line number="2895" hits="0"/>
+						<line number="2896" hits="0"/>
+						<line number="2897" hits="0"/>
+						<line number="2898" hits="0"/>
+						<line number="2899" hits="0"/>
+						<line number="2900" hits="0"/>
+						<line number="2901" hits="0"/>
+						<line number="2902" hits="0"/>
+						<line number="2903" hits="0"/>
+						<line number="2904" hits="0"/>
+						<line number="2905" hits="0"/>
+						<line number="2906" hits="0"/>
+						<line number="2907" hits="0"/>
+						<line number="2908" hits="0"/>
+						<line number="2909" hits="0"/>
+						<line number="2910" hits="0"/>
+						<line number="2911" hits="0"/>
+						<line number="2912" hits="0"/>
+						<line number="2913" hits="0"/>
+						<line number="2914" hits="0"/>
+						<line number="2915" hits="0"/>
+						<line number="2916" hits="0"/>
+						<line number="2917" hits="0"/>
+						<line number="2918" hits="0"/>
+						<line number="2919" hits="0"/>
+						<line number="2920" hits="0"/>
+						<line number="2921" hits="0"/>
+						<line number="2922" hits="0"/>
+						<line number="2923" hits="0"/>
+						<line number="2924" hits="0"/>
+						<line number="2925" hits="0"/>
+						<line number="2926" hits="0"/>
+						<line number="2927" hits="0"/>
+						<line number="2928" hits="0"/>
+						<line number="2929" hits="0"/>
+						<line number="2930" hits="0"/>
+						<line number="2931" hits="0"/>
+						<line number="2932" hits="0"/>
+						<line number="2933" hits="0"/>
+						<line number="2934" hits="0"/>
+						<line number="2935" hits="0"/>
+						<line number="2936" hits="0"/>
+						<line number="2937" hits="0"/>
+						<line number="2938" hits="0"/>
+						<line number="2939" hits="0"/>
+						<line number="2940" hits="0"/>
+						<line number="2941" hits="0"/>
+						<line number="2942" hits="0"/>
+						<line number="2943" hits="0"/>
+						<line number="2944" hits="0"/>
+						<line number="2945" hits="0"/>
+						<line number="2946" hits="0"/>
+						<line number="2947" hits="0"/>
+						<line number="2948" hits="0"/>
+						<line number="2949" hits="0"/>
+						<line number="2950" hits="0"/>
+						<line number="2951" hits="0"/>
+						<line number="2952" hits="0"/>
+						<line number="2953" hits="0"/>
+						<line number="2954" hits="0"/>
+						<line number="2955" hits="0"/>
+						<line number="2956" hits="0"/>
+						<line number="2957" hits="0"/>
+						<line number="2958" hits="0"/>
+						<line number="2959" hits="0"/>
+						<line number="2960" hits="0"/>
+						<line number="2961" hits="0"/>
+						<line number="2962" hits="0"/>
+						<line number="2963" hits="0"/>
+						<line number="2964" hits="0"/>
+						<line number="2965" hits="0"/>
+						<line number="2966" hits="0"/>
+						<line number="2967" hits="0"/>
+						<line number="2968" hits="0"/>
+						<line number="2969" hits="0"/>
+						<line number="2970" hits="0"/>
+						<line number="2971" hits="0"/>
+						<line number="2972" hits="0"/>
+						<line number="2973" hits="0"/>
+						<line number="2974" hits="0"/>
+						<line number="2975" hits="0"/>
+						<line number="2976" hits="0"/>
+						<line number="2977" hits="0"/>
+						<line number="2978" hits="0"/>
+						<line number="2979" hits="0"/>
+						<line number="2980" hits="0"/>
+						<line number="2981" hits="0"/>
+						<line number="2982" hits="0"/>
+						<line number="2983" hits="0"/>
+						<line number="2984" hits="0"/>
+						<line number="2985" hits="0"/>
+						<line number="2986" hits="0"/>
+						<line number="2987" hits="0"/>
+						<line number="2988" hits="0"/>
+						<line number="2989" hits="0"/>
+						<line number="2990" hits="0"/>
+						<line number="2991" hits="0"/>
+						<line number="2992" hits="0"/>
+						<line number="2993" hits="0"/>
+						<line number="2994" hits="0"/>
+						<line number="2995" hits="0"/>
+						<line number="2996" hits="0"/>
+						<line number="2997" hits="0"/>
+						<line number="2998" hits="0"/>
+						<line number="2999" hits="0"/>
+						<line number="3000" hits="0"/>
+						<line number="3001" hits="0"/>
+						<line number="3002" hits="0"/>
+						<line number="3003" hits="0"/>
+						<line number="3004" hits="0"/>
+						<line number="3005" hits="0"/>
+						<line number="3006" hits="0"/>
+						<line number="3007" hits="0"/>
+						<line number="3008" hits="0"/>
+						<line number="3009" hits="0"/>
+						<line number="3010" hits="0"/>
+						<line number="3011" hits="0"/>
+						<line number="3012" hits="0"/>
+						<line number="3013" hits="0"/>
+						<line number="3014" hits="0"/>
+						<line number="3015" hits="0"/>
+						<line number="3016" hits="0"/>
+						<line number="3017" hits="0"/>
+						<line number="3018" hits="0"/>
+						<line number="3019" hits="0"/>
+						<line number="3020" hits="0"/>
+						<line number="3021" hits="0"/>
+						<line number="3022" hits="0"/>
+						<line number="3023" hits="0"/>
+						<line number="3024" hits="0"/>
+						<line number="3025" hits="0"/>
+						<line number="3026" hits="0"/>
+						<line number="3027" hits="0"/>
+						<line number="3028" hits="0"/>
+						<line number="3029" hits="0"/>
+						<line number="3030" hits="0"/>
+						<line number="3031" hits="0"/>
+						<line number="3032" hits="0"/>
+						<line number="3033" hits="0"/>
+						<line number="3034" hits="0"/>
+						<line number="3035" hits="0"/>
+						<line number="3036" hits="0"/>
+						<line number="3037" hits="0"/>
+						<line number="3038" hits="0"/>
+						<line number="3039" hits="0"/>
+						<line number="3040" hits="0"/>
+						<line number="3041" hits="0"/>
+						<line number="3042" hits="0"/>
+						<line number="3043" hits="0"/>
+						<line number="3044" hits="0"/>
+						<line number="3045" hits="0"/>
+						<line number="3046" hits="0"/>
+						<line number="3047" hits="0"/>
+						<line number="3048" hits="0"/>
+						<line number="3049" hits="0"/>
+						<line number="3050" hits="0"/>
+						<line number="3051" hits="0"/>
+						<line number="3052" hits="0"/>
+						<line number="3053" hits="0"/>
+						<line number="3054" hits="0"/>
+						<line number="3055" hits="0"/>
+						<line number="3056" hits="0"/>
+						<line number="3057" hits="0"/>
+						<line number="3058" hits="0"/>
+						<line number="3059" hits="0"/>
+						<line number="3060" hits="0"/>
+						<line number="3061" hits="0"/>
+						<line number="3062" hits="0"/>
+						<line number="3063" hits="0"/>
+						<line number="3064" hits="0"/>
+						<line number="3065" hits="0"/>
+						<line number="3066" hits="0"/>
+						<line number="3067" hits="0"/>
+						<line number="3068" hits="0"/>
+						<line number="3069" hits="0"/>
+						<line number="3070" hits="0"/>
+						<line number="3071" hits="0"/>
+						<line number="3072" hits="0"/>
+						<line number="3073" hits="0"/>
+						<line number="3074" hits="0"/>
+						<line number="3075" hits="0"/>
+						<line number="3076" hits="0"/>
+						<line number="3077" hits="0"/>
+						<line number="3078" hits="0"/>
+						<line number="3079" hits="0"/>
+						<line number="3080" hits="0"/>
+						<line number="3081" hits="0"/>
+						<line number="3082" hits="0"/>
+						<line number="3083" hits="0"/>
+						<line number="3084" hits="0"/>
+						<line number="3085" hits="0"/>
+						<line number="3086" hits="0"/>
+						<line number="3087" hits="0"/>
+						<line number="3088" hits="0"/>
+						<line number="3089" hits="0"/>
+						<line number="3090" hits="0"/>
+						<line number="3091" hits="0"/>
+						<line number="3092" hits="0"/>
+						<line number="3093" hits="0"/>
+						<line number="3094" hits="0"/>
+						<line number="3095" hits="0"/>
+						<line number="3096" hits="0"/>
+						<line number="3097" hits="0"/>
+						<line number="3098" hits="0"/>
+						<line number="3099" hits="0"/>
+						<line number="3100" hits="0"/>
+						<line number="3101" hits="0"/>
+						<line number="3102" hits="0"/>
+						<line number="3103" hits="0"/>
+						<line number="3104" hits="0"/>
+						<line number="3105" hits="0"/>
+						<line number="3106" hits="0"/>
+						<line number="3107" hits="0"/>
+						<line number="3108" hits="0"/>
+						<line number="3109" hits="0"/>
+						<line number="3110" hits="0"/>
+						<line number="3111" hits="0"/>
+						<line number="3112" hits="0"/>
+						<line number="3113" hits="0"/>
+						<line number="3114" hits="0"/>
+						<line number="3115" hits="0"/>
+						<line number="3116" hits="0"/>
+						<line number="3117" hits="0"/>
+						<line number="3118" hits="0"/>
+						<line number="3119" hits="0"/>
+						<line number="3120" hits="0"/>
+						<line number="3121" hits="0"/>
+						<line number="3122" hits="0"/>
+						<line number="3123" hits="0"/>
+						<line number="3124" hits="0"/>
+						<line number="3125" hits="0"/>
+						<line number="3126" hits="0"/>
+						<line number="3127" hits="0"/>
+						<line number="3128" hits="0"/>
+						<line number="3129" hits="0"/>
+						<line number="3130" hits="0"/>
+						<line number="3131" hits="0"/>
+						<line number="3132" hits="0"/>
+						<line number="3133" hits="0"/>
+						<line number="3134" hits="0"/>
+						<line number="3135" hits="0"/>
+						<line number="3136" hits="0"/>
+						<line number="3137" hits="0"/>
+						<line number="3138" hits="0"/>
+						<line number="3139" hits="0"/>
+						<line number="3140" hits="0"/>
+						<line number="3141" hits="0"/>
+						<line number="3142" hits="0"/>
+						<line number="3143" hits="0"/>
+						<line number="3144" hits="0"/>
+						<line number="3145" hits="0"/>
+						<line number="3146" hits="0"/>
+						<line number="3147" hits="0"/>
+						<line number="3148" hits="0"/>
+						<line number="3149" hits="0"/>
+						<line number="3150" hits="0"/>
+						<line number="3151" hits="0"/>
+						<line number="3152" hits="0"/>
+						<line number="3153" hits="0"/>
+						<line number="3154" hits="0"/>
+						<line number="3155" hits="0"/>
+						<line number="3156" hits="0"/>
+						<line number="3157" hits="0"/>
+						<line number="3158" hits="0"/>
+						<line number="3159" hits="0"/>
+						<line number="3160" hits="0"/>
+						<line number="3161" hits="0"/>
+						<line number="3162" hits="0"/>
+						<line number="3163" hits="0"/>
+						<line number="3164" hits="0"/>
+						<line number="3165" hits="0"/>
+						<line number="3166" hits="0"/>
+						<line number="3167" hits="0"/>
+						<line number="3168" hits="0"/>
+						<line number="3169" hits="0"/>
+						<line number="3170" hits="0"/>
+						<line number="3171" hits="0"/>
+						<line number="3172" hits="0"/>
+						<line number="3173" hits="0"/>
+						<line number="3174" hits="0"/>
+						<line number="3175" hits="0"/>
+						<line number="3176" hits="0"/>
+						<line number="3177" hits="0"/>
+						<line number="3178" hits="0"/>
+						<line number="3179" hits="0"/>
+						<line number="3180" hits="0"/>
+						<line number="3181" hits="0"/>
+						<line number="3182" hits="0"/>
+						<line number="3183" hits="0"/>
+						<line number="3184" hits="0"/>
+						<line number="3185" hits="0"/>
+						<line number="3186" hits="0"/>
+						<line number="3187" hits="0"/>
+						<line number="3188" hits="0"/>
+						<line number="3189" hits="0"/>
+						<line number="3190" hits="0"/>
+						<line number="3191" hits="0"/>
+						<line number="3192" hits="0"/>
+						<line number="3193" hits="0"/>
+						<line number="3194" hits="0"/>
+						<line number="3195" hits="0"/>
+						<line number="3196" hits="0"/>
+						<line number="3197" hits="0"/>
+						<line number="3198" hits="0"/>
+						<line number="3199" hits="0"/>
+						<line number="3200" hits="0"/>
+						<line number="3201" hits="0"/>
+						<line number="3202" hits="0"/>
+						<line number="3203" hits="0"/>
+						<line number="3204" hits="0"/>
+						<line number="3205" hits="0"/>
+						<line number="3206" hits="0"/>
+						<line number="3207" hits="0"/>
+						<line number="3208" hits="0"/>
+						<line number="3209" hits="0"/>
+						<line number="3210" hits="0"/>
+						<line number="3211" hits="0"/>
+						<line number="3212" hits="0"/>
+						<line number="3213" hits="0"/>
+						<line number="3214" hits="0"/>
+						<line number="3215" hits="0"/>
+						<line number="3216" hits="0"/>
+						<line number="3217" hits="0"/>
+						<line number="3218" hits="0"/>
+						<line number="3219" hits="0"/>
+						<line number="3220" hits="0"/>
+						<line number="3221" hits="0"/>
+						<line number="3222" hits="0"/>
+						<line number="3223" hits="0"/>
+						<line number="3224" hits="0"/>
+						<line number="3225" hits="0"/>
+						<line number="3226" hits="0"/>
+						<line number="3227" hits="0"/>
+						<line number="3228" hits="0"/>
+						<line number="3229" hits="0"/>
+						<line number="3230" hits="0"/>
+						<line number="3231" hits="0"/>
+						<line number="3232" hits="0"/>
+						<line number="3233" hits="0"/>
+						<line number="3234" hits="0"/>
+						<line number="3235" hits="0"/>
+						<line number="3236" hits="0"/>
+						<line number="3237" hits="0"/>
+						<line number="3238" hits="0"/>
+						<line number="3239" hits="0"/>
+						<line number="3240" hits="0"/>
+						<line number="3241" hits="0"/>
+						<line number="3242" hits="0"/>
+						<line number="3243" hits="0"/>
+						<line number="3244" hits="0"/>
+						<line number="3245" hits="0"/>
+						<line number="3246" hits="0"/>
+						<line number="3247" hits="0"/>
+						<line number="3248" hits="0"/>
+						<line number="3249" hits="0"/>
+						<line number="3250" hits="0"/>
+						<line number="3251" hits="0"/>
+						<line number="3252" hits="0"/>
+						<line number="3253" hits="0"/>
+						<line number="3254" hits="0"/>
+						<line number="3255" hits="0"/>
+						<line number="3256" hits="0"/>
+						<line number="3257" hits="0"/>
+						<line number="3258" hits="0"/>
+						<line number="3259" hits="0"/>
+						<line number="3260" hits="0"/>
+						<line number="3261" hits="0"/>
+						<line number="3262" hits="0"/>
+						<line number="3263" hits="0"/>
+						<line number="3264" hits="0"/>
+						<line number="3265" hits="0"/>
+						<line number="3266" hits="0"/>
+						<line number="3267" hits="0"/>
+						<line number="3268" hits="0"/>
+						<line number="3269" hits="0"/>
+						<line number="3270" hits="0"/>
+						<line number="3271" hits="0"/>
+						<line number="3272" hits="0"/>
+						<line number="3273" hits="0"/>
+						<line number="3274" hits="0"/>
+						<line number="3275" hits="0"/>
+						<line number="3276" hits="0"/>
+						<line number="3277" hits="0"/>
+						<line number="3278" hits="0"/>
+						<line number="3279" hits="0"/>
+						<line number="3280" hits="0"/>
+					</lines>
+				</class>
+				<class name="lightning_pb2_grpc.py" filename="wallets/lnd_grpc_files/lightning_pb2_grpc.py" complexity="0" line-rate="0" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="2" hits="0"/>
+						<line number="3" hits="0"/>
+						<line number="5" hits="0"/>
+						<line number="8" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="130" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="145" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="155" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="165" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="180" hits="0"/>
+						<line number="185" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="195" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="210" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="220" hits="0"/>
+						<line number="225" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="235" hits="0"/>
+						<line number="240" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="250" hits="0"/>
+						<line number="255" hits="0"/>
+						<line number="260" hits="0"/>
+						<line number="265" hits="0"/>
+						<line number="270" hits="0"/>
+						<line number="275" hits="0"/>
+						<line number="280" hits="0"/>
+						<line number="285" hits="0"/>
+						<line number="290" hits="0"/>
+						<line number="295" hits="0"/>
+						<line number="300" hits="0"/>
+						<line number="305" hits="0"/>
+						<line number="310" hits="0"/>
+						<line number="315" hits="0"/>
+						<line number="320" hits="0"/>
+						<line number="325" hits="0"/>
+						<line number="330" hits="0"/>
+						<line number="335" hits="0"/>
+						<line number="340" hits="0"/>
+						<line number="345" hits="0"/>
+						<line number="350" hits="0"/>
+						<line number="355" hits="0"/>
+						<line number="362" hits="0"/>
+						<line number="383" hits="0"/>
+						<line number="389" hits="0"/>
+						<line number="390" hits="0"/>
+						<line number="391" hits="0"/>
+						<line number="393" hits="0"/>
+						<line number="399" hits="0"/>
+						<line number="400" hits="0"/>
+						<line number="401" hits="0"/>
+						<line number="403" hits="0"/>
+						<line number="408" hits="0"/>
+						<line number="409" hits="0"/>
+						<line number="410" hits="0"/>
+						<line number="412" hits="0"/>
+						<line number="422" hits="0"/>
+						<line number="423" hits="0"/>
+						<line number="424" hits="0"/>
+						<line number="426" hits="0"/>
+						<line number="434" hits="0"/>
+						<line number="435" hits="0"/>
+						<line number="436" hits="0"/>
+						<line number="438" hits="0"/>
+						<line number="445" hits="0"/>
+						<line number="446" hits="0"/>
+						<line number="447" hits="0"/>
+						<line number="449" hits="0"/>
+						<line number="455" hits="0"/>
+						<line number="456" hits="0"/>
+						<line number="457" hits="0"/>
+						<line number="459" hits="0"/>
+						<line number="466" hits="0"/>
+						<line number="467" hits="0"/>
+						<line number="468" hits="0"/>
+						<line number="470" hits="0"/>
+						<line number="474" hits="0"/>
+						<line number="475" hits="0"/>
+						<line number="476" hits="0"/>
+						<line number="478" hits="0"/>
+						<line number="484" hits="0"/>
+						<line number="485" hits="0"/>
+						<line number="486" hits="0"/>
+						<line number="488" hits="0"/>
+						<line number="495" hits="0"/>
+						<line number="496" hits="0"/>
+						<line number="497" hits="0"/>
+						<line number="499" hits="0"/>
+						<line number="505" hits="0"/>
+						<line number="506" hits="0"/>
+						<line number="507" hits="0"/>
+						<line number="509" hits="0"/>
+						<line number="515" hits="0"/>
+						<line number="516" hits="0"/>
+						<line number="517" hits="0"/>
+						<line number="519" hits="0"/>
+						<line number="523" hits="0"/>
+						<line number="524" hits="0"/>
+						<line number="525" hits="0"/>
+						<line number="527" hits="0"/>
+						<line number="533" hits="0"/>
+						<line number="534" hits="0"/>
+						<line number="535" hits="0"/>
+						<line number="537" hits="0"/>
+						<line number="543" hits="0"/>
+						<line number="544" hits="0"/>
+						<line number="545" hits="0"/>
+						<line number="547" hits="0"/>
+						<line number="553" hits="0"/>
+						<line number="554" hits="0"/>
+						<line number="555" hits="0"/>
+						<line number="557" hits="0"/>
+						<line number="566" hits="0"/>
+						<line number="567" hits="0"/>
+						<line number="568" hits="0"/>
+						<line number="570" hits="0"/>
+						<line number="575" hits="0"/>
+						<line number="576" hits="0"/>
+						<line number="577" hits="0"/>
+						<line number="579" hits="0"/>
+						<line number="586" hits="0"/>
+						<line number="587" hits="0"/>
+						<line number="588" hits="0"/>
+						<line number="590" hits="0"/>
+						<line number="595" hits="0"/>
+						<line number="596" hits="0"/>
+						<line number="597" hits="0"/>
+						<line number="599" hits="0"/>
+						<line number="606" hits="0"/>
+						<line number="607" hits="0"/>
+						<line number="608" hits="0"/>
+						<line number="610" hits="0"/>
+						<line number="621" hits="0"/>
+						<line number="622" hits="0"/>
+						<line number="623" hits="0"/>
+						<line number="625" hits="0"/>
+						<line number="633" hits="0"/>
+						<line number="634" hits="0"/>
+						<line number="635" hits="0"/>
+						<line number="637" hits="0"/>
+						<line number="648" hits="0"/>
+						<line number="649" hits="0"/>
+						<line number="650" hits="0"/>
+						<line number="652" hits="0"/>
+						<line number="660" hits="0"/>
+						<line number="661" hits="0"/>
+						<line number="662" hits="0"/>
+						<line number="664" hits="0"/>
+						<line number="674" hits="0"/>
+						<line number="675" hits="0"/>
+						<line number="676" hits="0"/>
+						<line number="678" hits="0"/>
+						<line number="687" hits="0"/>
+						<line number="688" hits="0"/>
+						<line number="689" hits="0"/>
+						<line number="691" hits="0"/>
+						<line number="699" hits="0"/>
+						<line number="700" hits="0"/>
+						<line number="701" hits="0"/>
+						<line number="703" hits="0"/>
+						<line number="710" hits="0"/>
+						<line number="711" hits="0"/>
+						<line number="712" hits="0"/>
+						<line number="714" hits="0"/>
+						<line number="722" hits="0"/>
+						<line number="723" hits="0"/>
+						<line number="724" hits="0"/>
+						<line number="726" hits="0"/>
+						<line number="731" hits="0"/>
+						<line number="732" hits="0"/>
+						<line number="733" hits="0"/>
+						<line number="735" hits="0"/>
+						<line number="741" hits="0"/>
+						<line number="742" hits="0"/>
+						<line number="743" hits="0"/>
+						<line number="745" hits="0"/>
+						<line number="755" hits="0"/>
+						<line number="756" hits="0"/>
+						<line number="757" hits="0"/>
+						<line number="759" hits="0"/>
+						<line number="765" hits="0"/>
+						<line number="766" hits="0"/>
+						<line number="767" hits="0"/>
+						<line number="769" hits="0"/>
+						<line number="781" hits="0"/>
+						<line number="782" hits="0"/>
+						<line number="783" hits="0"/>
+						<line number="785" hits="0"/>
+						<line number="791" hits="0"/>
+						<line number="792" hits="0"/>
+						<line number="793" hits="0"/>
+						<line number="795" hits="0"/>
+						<line number="799" hits="0"/>
+						<line number="800" hits="0"/>
+						<line number="801" hits="0"/>
+						<line number="803" hits="0"/>
+						<line number="808" hits="0"/>
+						<line number="809" hits="0"/>
+						<line number="810" hits="0"/>
+						<line number="812" hits="0"/>
+						<line number="817" hits="0"/>
+						<line number="818" hits="0"/>
+						<line number="819" hits="0"/>
+						<line number="821" hits="0"/>
+						<line number="830" hits="0"/>
+						<line number="831" hits="0"/>
+						<line number="832" hits="0"/>
+						<line number="834" hits="0"/>
+						<line number="839" hits="0"/>
+						<line number="840" hits="0"/>
+						<line number="841" hits="0"/>
+						<line number="843" hits="0"/>
+						<line number="850" hits="0"/>
+						<line number="851" hits="0"/>
+						<line number="852" hits="0"/>
+						<line number="854" hits="0"/>
+						<line number="859" hits="0"/>
+						<line number="860" hits="0"/>
+						<line number="861" hits="0"/>
+						<line number="863" hits="0"/>
+						<line number="876" hits="0"/>
+						<line number="877" hits="0"/>
+						<line number="878" hits="0"/>
+						<line number="880" hits="0"/>
+						<line number="885" hits="0"/>
+						<line number="886" hits="0"/>
+						<line number="887" hits="0"/>
+						<line number="889" hits="0"/>
+						<line number="894" hits="0"/>
+						<line number="895" hits="0"/>
+						<line number="896" hits="0"/>
+						<line number="898" hits="0"/>
+						<line number="907" hits="0"/>
+						<line number="908" hits="0"/>
+						<line number="909" hits="0"/>
+						<line number="911" hits="0"/>
+						<line number="918" hits="0"/>
+						<line number="919" hits="0"/>
+						<line number="920" hits="0"/>
+						<line number="922" hits="0"/>
+						<line number="927" hits="0"/>
+						<line number="928" hits="0"/>
+						<line number="929" hits="0"/>
+						<line number="931" hits="0"/>
+						<line number="936" hits="0"/>
+						<line number="937" hits="0"/>
+						<line number="938" hits="0"/>
+						<line number="940" hits="0"/>
+						<line number="954" hits="0"/>
+						<line number="955" hits="0"/>
+						<line number="956" hits="0"/>
+						<line number="958" hits="0"/>
+						<line number="967" hits="0"/>
+						<line number="968" hits="0"/>
+						<line number="969" hits="0"/>
+						<line number="971" hits="0"/>
+						<line number="979" hits="0"/>
+						<line number="980" hits="0"/>
+						<line number="981" hits="0"/>
+						<line number="983" hits="0"/>
+						<line number="989" hits="0"/>
+						<line number="990" hits="0"/>
+						<line number="991" hits="0"/>
+						<line number="993" hits="0"/>
+						<line number="1000" hits="0"/>
+						<line number="1001" hits="0"/>
+						<line number="1002" hits="0"/>
+						<line number="1004" hits="0"/>
+						<line number="1014" hits="0"/>
+						<line number="1015" hits="0"/>
+						<line number="1016" hits="0"/>
+						<line number="1018" hits="0"/>
+						<line number="1024" hits="0"/>
+						<line number="1025" hits="0"/>
+						<line number="1026" hits="0"/>
+						<line number="1028" hits="0"/>
+						<line number="1032" hits="0"/>
+						<line number="1033" hits="0"/>
+						<line number="1034" hits="0"/>
+						<line number="1036" hits="0"/>
+						<line number="1041" hits="0"/>
+						<line number="1042" hits="0"/>
+						<line number="1043" hits="0"/>
+						<line number="1045" hits="0"/>
+						<line number="1050" hits="0"/>
+						<line number="1051" hits="0"/>
+						<line number="1052" hits="0"/>
+						<line number="1054" hits="0"/>
+						<line number="1060" hits="0"/>
+						<line number="1061" hits="0"/>
+						<line number="1062" hits="0"/>
+						<line number="1064" hits="0"/>
+						<line number="1079" hits="0"/>
+						<line number="1080" hits="0"/>
+						<line number="1081" hits="0"/>
+						<line number="1083" hits="0"/>
+						<line number="1087" hits="0"/>
+						<line number="1088" hits="0"/>
+						<line number="1089" hits="0"/>
+						<line number="1091" hits="0"/>
+						<line number="1096" hits="0"/>
+						<line number="1097" hits="0"/>
+						<line number="1098" hits="0"/>
+						<line number="1101" hits="0"/>
+						<line number="1102" hits="0"/>
+						<line number="1429" hits="0"/>
+						<line number="1432" hits="0"/>
+						<line number="1436" hits="0"/>
+						<line number="1457" hits="0"/>
+						<line number="1458" hits="0"/>
+						<line number="1470" hits="0"/>
+						<line number="1486" hits="0"/>
+						<line number="1487" hits="0"/>
+						<line number="1499" hits="0"/>
+						<line number="1515" hits="0"/>
+						<line number="1516" hits="0"/>
+						<line number="1528" hits="0"/>
+						<line number="1544" hits="0"/>
+						<line number="1545" hits="0"/>
+						<line number="1557" hits="0"/>
+						<line number="1573" hits="0"/>
+						<line number="1574" hits="0"/>
+						<line number="1586" hits="0"/>
+						<line number="1602" hits="0"/>
+						<line number="1603" hits="0"/>
+						<line number="1615" hits="0"/>
+						<line number="1631" hits="0"/>
+						<line number="1632" hits="0"/>
+						<line number="1644" hits="0"/>
+						<line number="1660" hits="0"/>
+						<line number="1661" hits="0"/>
+						<line number="1673" hits="0"/>
+						<line number="1689" hits="0"/>
+						<line number="1690" hits="0"/>
+						<line number="1702" hits="0"/>
+						<line number="1718" hits="0"/>
+						<line number="1719" hits="0"/>
+						<line number="1731" hits="0"/>
+						<line number="1747" hits="0"/>
+						<line number="1748" hits="0"/>
+						<line number="1760" hits="0"/>
+						<line number="1776" hits="0"/>
+						<line number="1777" hits="0"/>
+						<line number="1789" hits="0"/>
+						<line number="1805" hits="0"/>
+						<line number="1806" hits="0"/>
+						<line number="1818" hits="0"/>
+						<line number="1834" hits="0"/>
+						<line number="1835" hits="0"/>
+						<line number="1847" hits="0"/>
+						<line number="1863" hits="0"/>
+						<line number="1864" hits="0"/>
+						<line number="1876" hits="0"/>
+						<line number="1892" hits="0"/>
+						<line number="1893" hits="0"/>
+						<line number="1905" hits="0"/>
+						<line number="1921" hits="0"/>
+						<line number="1922" hits="0"/>
+						<line number="1934" hits="0"/>
+						<line number="1950" hits="0"/>
+						<line number="1951" hits="0"/>
+						<line number="1963" hits="0"/>
+						<line number="1979" hits="0"/>
+						<line number="1980" hits="0"/>
+						<line number="1992" hits="0"/>
+						<line number="2008" hits="0"/>
+						<line number="2009" hits="0"/>
+						<line number="2021" hits="0"/>
+						<line number="2037" hits="0"/>
+						<line number="2038" hits="0"/>
+						<line number="2050" hits="0"/>
+						<line number="2066" hits="0"/>
+						<line number="2067" hits="0"/>
+						<line number="2079" hits="0"/>
+						<line number="2095" hits="0"/>
+						<line number="2096" hits="0"/>
+						<line number="2108" hits="0"/>
+						<line number="2124" hits="0"/>
+						<line number="2125" hits="0"/>
+						<line number="2137" hits="0"/>
+						<line number="2153" hits="0"/>
+						<line number="2154" hits="0"/>
+						<line number="2166" hits="0"/>
+						<line number="2182" hits="0"/>
+						<line number="2183" hits="0"/>
+						<line number="2195" hits="0"/>
+						<line number="2211" hits="0"/>
+						<line number="2212" hits="0"/>
+						<line number="2224" hits="0"/>
+						<line number="2240" hits="0"/>
+						<line number="2241" hits="0"/>
+						<line number="2253" hits="0"/>
+						<line number="2269" hits="0"/>
+						<line number="2270" hits="0"/>
+						<line number="2282" hits="0"/>
+						<line number="2298" hits="0"/>
+						<line number="2299" hits="0"/>
+						<line number="2311" hits="0"/>
+						<line number="2327" hits="0"/>
+						<line number="2328" hits="0"/>
+						<line number="2340" hits="0"/>
+						<line number="2356" hits="0"/>
+						<line number="2357" hits="0"/>
+						<line number="2369" hits="0"/>
+						<line number="2385" hits="0"/>
+						<line number="2386" hits="0"/>
+						<line number="2398" hits="0"/>
+						<line number="2414" hits="0"/>
+						<line number="2415" hits="0"/>
+						<line number="2427" hits="0"/>
+						<line number="2443" hits="0"/>
+						<line number="2444" hits="0"/>
+						<line number="2456" hits="0"/>
+						<line number="2472" hits="0"/>
+						<line number="2473" hits="0"/>
+						<line number="2485" hits="0"/>
+						<line number="2501" hits="0"/>
+						<line number="2502" hits="0"/>
+						<line number="2514" hits="0"/>
+						<line number="2530" hits="0"/>
+						<line number="2531" hits="0"/>
+						<line number="2543" hits="0"/>
+						<line number="2559" hits="0"/>
+						<line number="2560" hits="0"/>
+						<line number="2572" hits="0"/>
+						<line number="2588" hits="0"/>
+						<line number="2589" hits="0"/>
+						<line number="2601" hits="0"/>
+						<line number="2617" hits="0"/>
+						<line number="2618" hits="0"/>
+						<line number="2630" hits="0"/>
+						<line number="2646" hits="0"/>
+						<line number="2647" hits="0"/>
+						<line number="2659" hits="0"/>
+						<line number="2675" hits="0"/>
+						<line number="2676" hits="0"/>
+						<line number="2688" hits="0"/>
+						<line number="2704" hits="0"/>
+						<line number="2705" hits="0"/>
+						<line number="2717" hits="0"/>
+						<line number="2733" hits="0"/>
+						<line number="2734" hits="0"/>
+						<line number="2746" hits="0"/>
+						<line number="2762" hits="0"/>
+						<line number="2763" hits="0"/>
+						<line number="2775" hits="0"/>
+						<line number="2791" hits="0"/>
+						<line number="2792" hits="0"/>
+						<line number="2804" hits="0"/>
+						<line number="2820" hits="0"/>
+						<line number="2821" hits="0"/>
+						<line number="2833" hits="0"/>
+						<line number="2849" hits="0"/>
+						<line number="2850" hits="0"/>
+						<line number="2862" hits="0"/>
+						<line number="2878" hits="0"/>
+						<line number="2879" hits="0"/>
+						<line number="2891" hits="0"/>
+						<line number="2907" hits="0"/>
+						<line number="2908" hits="0"/>
+						<line number="2920" hits="0"/>
+						<line number="2936" hits="0"/>
+						<line number="2937" hits="0"/>
+						<line number="2949" hits="0"/>
+						<line number="2965" hits="0"/>
+						<line number="2966" hits="0"/>
+						<line number="2978" hits="0"/>
+						<line number="2994" hits="0"/>
+						<line number="2995" hits="0"/>
+						<line number="3007" hits="0"/>
+						<line number="3023" hits="0"/>
+						<line number="3024" hits="0"/>
+						<line number="3036" hits="0"/>
+						<line number="3052" hits="0"/>
+						<line number="3053" hits="0"/>
+						<line number="3065" hits="0"/>
+						<line number="3081" hits="0"/>
+						<line number="3082" hits="0"/>
+						<line number="3094" hits="0"/>
+						<line number="3110" hits="0"/>
+						<line number="3111" hits="0"/>
+						<line number="3123" hits="0"/>
+						<line number="3139" hits="0"/>
+						<line number="3140" hits="0"/>
+						<line number="3152" hits="0"/>
+						<line number="3168" hits="0"/>
+						<line number="3169" hits="0"/>
+						<line number="3181" hits="0"/>
+						<line number="3197" hits="0"/>
+						<line number="3198" hits="0"/>
+						<line number="3210" hits="0"/>
+						<line number="3226" hits="0"/>
+						<line number="3227" hits="0"/>
+						<line number="3239" hits="0"/>
+						<line number="3255" hits="0"/>
+						<line number="3256" hits="0"/>
+						<line number="3268" hits="0"/>
+						<line number="3284" hits="0"/>
+						<line number="3285" hits="0"/>
+						<line number="3297" hits="0"/>
+						<line number="3313" hits="0"/>
+						<line number="3314" hits="0"/>
+						<line number="3326" hits="0"/>
+					</lines>
+				</class>
+				<class name="router_pb2.py" filename="wallets/lnd_grpc_files/router_pb2.py" complexity="0" line-rate="0" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="4" hits="0"/>
+						<line number="5" hits="0"/>
+						<line number="6" hits="0"/>
+						<line number="7" hits="0"/>
+						<line number="8" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="10" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="17" hits="0"/>
+						<line number="19" hits="0"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
+						<line number="28" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="78" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="104" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="121" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
+						<line number="126" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="132" hits="0"/>
+						<line number="135" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="156" hits="0"/>
+						<line number="157" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="201" hits="0"/>
+						<line number="203" hits="0"/>
+						<line number="212" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="223" hits="0"/>
+						<line number="225" hits="0"/>
+						<line number="234" hits="0"/>
+						<line number="236" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="256" hits="0"/>
+						<line number="258" hits="0"/>
+						<line number="267" hits="0"/>
+						<line number="269" hits="0"/>
+						<line number="278" hits="0"/>
+						<line number="280" hits="0"/>
+						<line number="289" hits="0"/>
+						<line number="291" hits="0"/>
+						<line number="300" hits="0"/>
+						<line number="302" hits="0"/>
+						<line number="311" hits="0"/>
+						<line number="313" hits="0"/>
+						<line number="322" hits="0"/>
+						<line number="324" hits="0"/>
+						<line number="333" hits="0"/>
+						<line number="335" hits="0"/>
+						<line number="344" hits="0"/>
+						<line number="346" hits="0"/>
+						<line number="355" hits="0"/>
+						<line number="357" hits="0"/>
+						<line number="366" hits="0"/>
+						<line number="368" hits="0"/>
+						<line number="377" hits="0"/>
+						<line number="379" hits="0"/>
+						<line number="388" hits="0"/>
+						<line number="390" hits="0"/>
+						<line number="399" hits="0"/>
+						<line number="401" hits="0"/>
+						<line number="410" hits="0"/>
+						<line number="412" hits="0"/>
+						<line number="421" hits="0"/>
+						<line number="423" hits="0"/>
+						<line number="432" hits="0"/>
+						<line number="434" hits="0"/>
+						<line number="443" hits="0"/>
+						<line number="445" hits="0"/>
+						<line number="454" hits="0"/>
+						<line number="456" hits="0"/>
+						<line number="465" hits="0"/>
+						<line number="467" hits="0"/>
+						<line number="476" hits="0"/>
+						<line number="478" hits="0"/>
+						<line number="487" hits="0"/>
+						<line number="489" hits="0"/>
+						<line number="498" hits="0"/>
+						<line number="500" hits="0"/>
+						<line number="518" hits="0"/>
+						<line number="519" hits="0"/>
+						<line number="521" hits="0"/>
+						<line number="530" hits="0"/>
+						<line number="532" hits="0"/>
+						<line number="541" hits="0"/>
+						<line number="543" hits="0"/>
+						<line number="552" hits="0"/>
+						<line number="554" hits="0"/>
+						<line number="555" hits="0"/>
+						<line number="557" hits="0"/>
+						<line number="558" hits="0"/>
+						<line number="561" hits="0"/>
+						<line number="562" hits="0"/>
+						<line number="563" hits="0"/>
+						<line number="564" hits="0"/>
+						<line number="567" hits="0"/>
+						<line number="568" hits="0"/>
+						<line number="569" hits="0"/>
+						<line number="570" hits="0"/>
+						<line number="571" hits="0"/>
+						<line number="572" hits="0"/>
+						<line number="573" hits="0"/>
+						<line number="574" hits="0"/>
+						<line number="575" hits="0"/>
+						<line number="576" hits="0"/>
+						<line number="577" hits="0"/>
+						<line number="578" hits="0"/>
+						<line number="579" hits="0"/>
+						<line number="580" hits="0"/>
+						<line number="581" hits="0"/>
+						<line number="582" hits="0"/>
+						<line number="583" hits="0"/>
+						<line number="584" hits="0"/>
+						<line number="585" hits="0"/>
+						<line number="586" hits="0"/>
+						<line number="587" hits="0"/>
+						<line number="588" hits="0"/>
+						<line number="589" hits="0"/>
+						<line number="590" hits="0"/>
+						<line number="591" hits="0"/>
+						<line number="592" hits="0"/>
+						<line number="593" hits="0"/>
+						<line number="594" hits="0"/>
+						<line number="595" hits="0"/>
+						<line number="596" hits="0"/>
+						<line number="597" hits="0"/>
+						<line number="598" hits="0"/>
+						<line number="599" hits="0"/>
+						<line number="600" hits="0"/>
+						<line number="601" hits="0"/>
+						<line number="602" hits="0"/>
+						<line number="603" hits="0"/>
+						<line number="604" hits="0"/>
+						<line number="605" hits="0"/>
+						<line number="606" hits="0"/>
+						<line number="607" hits="0"/>
+						<line number="608" hits="0"/>
+						<line number="609" hits="0"/>
+						<line number="610" hits="0"/>
+						<line number="611" hits="0"/>
+						<line number="612" hits="0"/>
+						<line number="613" hits="0"/>
+						<line number="614" hits="0"/>
+						<line number="615" hits="0"/>
+						<line number="616" hits="0"/>
+						<line number="617" hits="0"/>
+						<line number="618" hits="0"/>
+						<line number="619" hits="0"/>
+						<line number="620" hits="0"/>
+						<line number="621" hits="0"/>
+						<line number="622" hits="0"/>
+						<line number="623" hits="0"/>
+						<line number="624" hits="0"/>
+						<line number="625" hits="0"/>
+						<line number="626" hits="0"/>
+						<line number="627" hits="0"/>
+						<line number="628" hits="0"/>
+						<line number="629" hits="0"/>
+						<line number="630" hits="0"/>
+						<line number="631" hits="0"/>
+						<line number="632" hits="0"/>
+						<line number="633" hits="0"/>
+						<line number="634" hits="0"/>
+						<line number="635" hits="0"/>
+						<line number="636" hits="0"/>
+						<line number="637" hits="0"/>
+						<line number="638" hits="0"/>
+						<line number="639" hits="0"/>
+						<line number="640" hits="0"/>
+						<line number="641" hits="0"/>
+						<line number="642" hits="0"/>
+						<line number="643" hits="0"/>
+						<line number="644" hits="0"/>
+						<line number="645" hits="0"/>
+						<line number="646" hits="0"/>
+						<line number="647" hits="0"/>
+						<line number="648" hits="0"/>
+						<line number="649" hits="0"/>
+						<line number="650" hits="0"/>
+						<line number="651" hits="0"/>
+						<line number="652" hits="0"/>
+						<line number="653" hits="0"/>
+						<line number="654" hits="0"/>
+						<line number="655" hits="0"/>
+						<line number="656" hits="0"/>
+						<line number="657" hits="0"/>
+						<line number="658" hits="0"/>
+						<line number="659" hits="0"/>
+						<line number="660" hits="0"/>
+						<line number="661" hits="0"/>
+						<line number="662" hits="0"/>
+						<line number="663" hits="0"/>
+						<line number="664" hits="0"/>
+					</lines>
+				</class>
+				<class name="router_pb2_grpc.py" filename="wallets/lnd_grpc_files/router_pb2_grpc.py" complexity="0" line-rate="0" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="2" hits="0"/>
+						<line number="3" hits="0"/>
+						<line number="5" hits="0"/>
+						<line number="6" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="20" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="75" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="100" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="112" hits="0"/>
+						<line number="118" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="120" hits="0"/>
+						<line number="122" hits="0"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="129" hits="0"/>
+						<line number="131" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="137" hits="0"/>
+						<line number="138" hits="0"/>
+						<line number="140" hits="0"/>
+						<line number="148" hits="0"/>
+						<line number="149" hits="0"/>
+						<line number="150" hits="0"/>
+						<line number="152" hits="0"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="163" hits="0"/>
+						<line number="168" hits="0"/>
+						<line number="169" hits="0"/>
+						<line number="170" hits="0"/>
+						<line number="172" hits="0"/>
+						<line number="177" hits="0"/>
+						<line number="178" hits="0"/>
+						<line number="179" hits="0"/>
+						<line number="181" hits="0"/>
+						<line number="188" hits="0"/>
+						<line number="189" hits="0"/>
+						<line number="190" hits="0"/>
+						<line number="192" hits="0"/>
+						<line number="196" hits="0"/>
+						<line number="197" hits="0"/>
+						<line number="198" hits="0"/>
+						<line number="200" hits="0"/>
+						<line number="205" hits="0"/>
+						<line number="206" hits="0"/>
+						<line number="207" hits="0"/>
+						<line number="209" hits="0"/>
+						<line number="214" hits="0"/>
+						<line number="215" hits="0"/>
+						<line number="216" hits="0"/>
+						<line number="218" hits="0"/>
+						<line number="224" hits="0"/>
+						<line number="225" hits="0"/>
+						<line number="226" hits="0"/>
+						<line number="228" hits="0"/>
+						<line number="233" hits="0"/>
+						<line number="234" hits="0"/>
+						<line number="235" hits="0"/>
+						<line number="237" hits="0"/>
+						<line number="243" hits="0"/>
+						<line number="244" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="252" hits="0"/>
+						<line number="253" hits="0"/>
+						<line number="254" hits="0"/>
+						<line number="256" hits="0"/>
+						<line number="264" hits="0"/>
+						<line number="265" hits="0"/>
+						<line number="266" hits="0"/>
+						<line number="268" hits="0"/>
+						<line number="275" hits="0"/>
+						<line number="276" hits="0"/>
+						<line number="277" hits="0"/>
+						<line number="280" hits="0"/>
+						<line number="281" hits="0"/>
+						<line number="368" hits="0"/>
+						<line number="371" hits="0"/>
+						<line number="375" hits="0"/>
+						<line number="380" hits="0"/>
+						<line number="381" hits="0"/>
+						<line number="393" hits="0"/>
+						<line number="409" hits="0"/>
+						<line number="410" hits="0"/>
+						<line number="422" hits="0"/>
+						<line number="438" hits="0"/>
+						<line number="439" hits="0"/>
+						<line number="451" hits="0"/>
+						<line number="467" hits="0"/>
+						<line number="468" hits="0"/>
+						<line number="480" hits="0"/>
+						<line number="496" hits="0"/>
+						<line number="497" hits="0"/>
+						<line number="509" hits="0"/>
+						<line number="525" hits="0"/>
+						<line number="526" hits="0"/>
+						<line number="538" hits="0"/>
+						<line number="554" hits="0"/>
+						<line number="555" hits="0"/>
+						<line number="567" hits="0"/>
+						<line number="583" hits="0"/>
+						<line number="584" hits="0"/>
+						<line number="596" hits="0"/>
+						<line number="612" hits="0"/>
+						<line number="613" hits="0"/>
+						<line number="625" hits="0"/>
+						<line number="641" hits="0"/>
+						<line number="642" hits="0"/>
+						<line number="654" hits="0"/>
+						<line number="670" hits="0"/>
+						<line number="671" hits="0"/>
+						<line number="683" hits="0"/>
+						<line number="699" hits="0"/>
+						<line number="700" hits="0"/>
+						<line number="712" hits="0"/>
+						<line number="728" hits="0"/>
+						<line number="729" hits="0"/>
+						<line number="741" hits="0"/>
+						<line number="757" hits="0"/>
+						<line number="758" hits="0"/>
+						<line number="770" hits="0"/>
+						<line number="786" hits="0"/>
+						<line number="787" hits="0"/>
+						<line number="799" hits="0"/>
+						<line number="815" hits="0"/>
+						<line number="816" hits="0"/>
+						<line number="828" hits="0"/>
+						<line number="844" hits="0"/>
+						<line number="845" hits="0"/>
+						<line number="857" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="wallets.macaroon" line-rate="0.2857" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="wallets/macaroon/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+					</lines>
+				</class>
+				<class name="macaroon.py" filename="wallets/macaroon/macaroon.py" complexity="0" line-rate="0.2754" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="23" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="29" hits="0"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="36" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="0"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="65" hits="1"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="71" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+						<line number="76" hits="1"/>
+						<line number="78" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="81" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="104" hits="1"/>
+						<line number="105" hits="0"/>
+						<line number="106" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+	</packages>
+</coverage>

From 0a54fe6db8349c36d1121cb446d0859133d799fb Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 16 Aug 2022 12:07:23 +0100
Subject: [PATCH 071/174] ui and checkout

---
 .../templates/diagonalley/stall.html          | 36 ++++++++-----------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 226ecd2b..5638bc3d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -112,9 +112,9 @@
 
       <q-card-section class="q-py-sm">
         <div>
-          <div class="text-caption text-green-8 text-weight-bolder">
-            {{ item.stall }}
-          </div>
+          <!-- <div class="text-caption text-green-8 text-weight-bolder">
+            {{ stall.name }}
+          </div> -->
           <span class="text-h6">{{ item.price }} sats</span
           ><span class="q-ml-sm text-grey-6"
             >BTC {{ (item.price / 1e8).toFixed(8) }}</span
@@ -155,7 +155,7 @@
   </div>
   <!-- CHECKOUT DIALOG -->
   <q-dialog v-model="checkoutDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <q-form @submit="placeOrder" class="q-gutter-md">
         <q-input
           filled
@@ -181,26 +181,15 @@
           dense
           type="email"
           label="Email"
-        />
+        ></q-input>
         <div class="row q-mt-lg">
           <q-btn
-            v-if="checkoutDialog.data.id"
             unelevated
             color="primary"
+            :disable="checkoutDialog.data.address_1 == null
+              || checkoutDialog.data.email == null"
             type="submit"
-            >Update Product</q-btn
-          >
-
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="checkoutDialog.data.price == null
-              || checkoutDialog.data.product == null
-              || checkoutDialog.data.description == null
-              || checkoutDialog.data.quantity == null"
-            type="submit"
-            >Create Product</q-btn
+            >Checkout</q-btn
           >
 
           <q-btn
@@ -224,6 +213,7 @@
     mixins: [windowMixin],
     data: function () {
       return {
+        stall: null,
         products: [],
         searchText: null,
         cart: {
@@ -291,11 +281,13 @@
       }
     },
     created() {
+      this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = JSON.parse('{{ products | tojson }}')
-      let stall_ids = new Set()
-      this.products.map(p => stall_ids.add(p.stall))
 
-      console.log(stall_ids)
+      //let stall_ids = new Set()
+      //this.products.map(p => stall_ids.add(p.stall))
+
+      console.log(this.stall)
     }
   })
 </script>

From d9242ddd5be6edc5d91e49828d4abcf789202c04 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 16 Aug 2022 12:07:56 +0100
Subject: [PATCH 072/174] remove privatekey from stall

---
 lnbits/extensions/diagonalley/views.py | 43 ++++++++++++++------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 2ec75589..08c30428 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -3,11 +3,12 @@ from http import HTTPStatus
 from fastapi import Request
 from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
-from starlette.exceptions import HTTPException
-from starlette.responses import HTMLResponse
 
 from .crud import get_diagonalley_products, get_diagonalley_stall
 
@@ -30,29 +31,33 @@ async def display(request: Request, stall_id):
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
         )
+
+    stall = stall.dict()
+    del stall["privatekey"]
+    
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
         {
             "request": request,
-            "stall": stall.dict(),
+            "stall": stall,
             "products": [product.dict() for product in products]
         },
     )
 
-@diagonalley_ext.get("/{market_id}", response_class=HTMLResponse)
-async def display(request: Request, stall_id):
-    stalls = await get_diagonalley_stall(stall_id)
-    products = await get_diagonalley_products(stall_id)
+# @diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
+# async def display(request: Request, stall_id):
+#     stalls = await get_diagonalley_stall(stall_id)
+#     products = await get_diagonalley_products(stall_id)
 
-    if not stall:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
-        )
-    return diagonalley_renderer().TemplateResponse(
-        "diagonalley/stall.html",
-        {
-            "request": request,
-            "stall": stall.dict(),
-            "products": [product.dict() for product in products]
-        },
-    )
+#     if not stall:
+#         raise HTTPException(
+#             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
+#         )
+#     return diagonalley_renderer().TemplateResponse(
+#         "diagonalley/stall.html",
+#         {
+#             "request": request,
+#             "stall": stall.dict(),
+#             "products": [product.dict() for product in products]
+#         },
+#     )

From 8032566f4491a3cf5caaf5e8d719e0de3b30be34 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 16 Aug 2022 12:08:27 +0100
Subject: [PATCH 073/174] place order flow WIP

---
 lnbits/extensions/diagonalley/crud.py       | 45 +++++++++++++++------
 lnbits/extensions/diagonalley/migrations.py |  9 ++---
 lnbits/extensions/diagonalley/models.py     | 21 ++++++++--
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index fbc1d332..b915c81d 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -13,11 +13,13 @@ from lnbits.settings import WALLET
 from . import db
 from .models import (
     Market,
+    OrderDetail,
     Orders,
     Products,
     Stalls,
     Zones,
     createOrder,
+    createOrderDetails,
     createProduct,
     createStalls,
     createZones,
@@ -208,38 +210,55 @@ async def delete_diagonalley_stall(stall_id: str) -> None:
 ###Orders
 
 
-async def create_diagonalley_order(data: createOrder) -> Orders:
+async def create_diagonalley_order(wallet_id: str, data: createOrder) -> Orders:
 
     order_id = urlsafe_short_hash()
     await db.execute(
         f"""
-            INSERT INTO diagonalley.orders (id, productid, wallet, product,
-            quantity, shippingzone, address, email, invoiceid, paid, shipped)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            INSERT INTO diagonalley.orders (id, wallet, shippingzone, address, email, total, invoiceid, paid, shipped)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
             """,
         (
             order_id,
-            data.productid,
-            data.wallet,
-            data.product,
-            data.quantity,
+            wallet_id,
             data.shippingzone,
             data.address,
             data.email,
+            data.total,
             data.invoiceid,
             False,
             False,
         ),
     )
-    # if db.type == SQLITE:
-    #     order_id = result._result_proxy.lastrowid
-    # else:
-    #     order_id = result[0]
-
+    
     link = await get_diagonalley_order(order_id)
     assert link, "Newly created link couldn't be retrieved"
     return link
 
+async def create_diagonalley_order_details(order_id: str, data: List[createOrderDetails]):
+    for item in data:
+        item_id = urlsafe_short_hash()
+        await db.execute(
+            """
+            INSERT INTO diagonalley.order_details (id, orderid, productid, quantity)
+            VALUES (?, ?, ?, ?)
+            """,
+            (
+                item_id,
+                order_id,
+                item.product_id,
+                item.quantity,
+            ),
+        )
+    order_details = await get_diagonalley_order_details(order_id)
+    return order_details
+
+async def get_diagonalley_order_details(order_id: str) -> List[OrderDetail]:
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.order_details WHERE order_id = ?", (order_id,)
+    )
+
+    return [OrderDetail(**row) for row in rows]
 
 async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
     row = await db.fetchone(
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index e994d723..8a65df8a 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -56,12 +56,12 @@ async def m001_initial(db):
         """
         CREATE TABLE diagonalley.orders (
             id {db.serial_primary_key},
-            productid TEXT NOT NULL,
-            usr TEXT NOT NULL,
-            pubkey TEXT NOT NULL,
+            wallet TEXT NOT NULL,
+            pubkey TEXT,
             shippingzone INTEGER NOT NULL,
             address TEXT NOT NULL,
             email TEXT NOT NULL,
+            total INTEGER NOT NULL,
             invoiceid TEXT NOT NULL,
             paid BOOLEAN NOT NULL,
             shipped BOOLEAN NOT NULL,
@@ -81,8 +81,7 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             orderid INTEGER NOT NULL REFERENCES {db.references_schema}orders (id)
             productid TEXT NOT NULL REFERENCES {db.references_schema}products (id),
-            quantity INTEGER NOT NULL,
-            total INTEGER NOT NULL 
+            quantity INTEGER NOT NULL
         );
     """
     )
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 4fbf04ff..737f2b4b 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -55,16 +55,29 @@ class Zones(BaseModel):
     cost: int
     countries: str
 
+class OrderDetail(BaseModel):
+    id: str
+    order_id: str
+    product_id: str
+    quantity: int
+
+class createOrderDetails(BaseModel):
+    product_id: str = Query(...)
+    quantity: int = Query(..., ge=1)
+
 
 class createOrder(BaseModel):
-    productid: str = Query(...)
-    stall: str = Query(...)
-    product: str = Query(...)
-    quantity: int = Query(..., ge=1)
+    wallet: str = Query(...)
+    pubkey: str = Query(None)
     shippingzone: int = Query(...)
     address: str = Query(...)
     email: str = Query(...)
+    total: int = Query(...)
     invoiceid: str = Query(...)
+    products: List[createOrderDetails]
+    # stall: str = Query(...)
+    # product: str = Query(...)
+    # quantity: int = Query(..., ge=1)
 
 
 class Orders(BaseModel):

From 25d0309ff31d2e5563a02c4aa0f2fc1bbb09d3fc Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 16 Aug 2022 12:07:23 +0100
Subject: [PATCH 074/174] ui and checkout

---
 .../templates/diagonalley/stall.html          | 36 ++++++++-----------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 226ecd2b..5638bc3d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -112,9 +112,9 @@
 
       <q-card-section class="q-py-sm">
         <div>
-          <div class="text-caption text-green-8 text-weight-bolder">
-            {{ item.stall }}
-          </div>
+          <!-- <div class="text-caption text-green-8 text-weight-bolder">
+            {{ stall.name }}
+          </div> -->
           <span class="text-h6">{{ item.price }} sats</span
           ><span class="q-ml-sm text-grey-6"
             >BTC {{ (item.price / 1e8).toFixed(8) }}</span
@@ -155,7 +155,7 @@
   </div>
   <!-- CHECKOUT DIALOG -->
   <q-dialog v-model="checkoutDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <q-form @submit="placeOrder" class="q-gutter-md">
         <q-input
           filled
@@ -181,26 +181,15 @@
           dense
           type="email"
           label="Email"
-        />
+        ></q-input>
         <div class="row q-mt-lg">
           <q-btn
-            v-if="checkoutDialog.data.id"
             unelevated
             color="primary"
+            :disable="checkoutDialog.data.address_1 == null
+              || checkoutDialog.data.email == null"
             type="submit"
-            >Update Product</q-btn
-          >
-
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="checkoutDialog.data.price == null
-              || checkoutDialog.data.product == null
-              || checkoutDialog.data.description == null
-              || checkoutDialog.data.quantity == null"
-            type="submit"
-            >Create Product</q-btn
+            >Checkout</q-btn
           >
 
           <q-btn
@@ -224,6 +213,7 @@
     mixins: [windowMixin],
     data: function () {
       return {
+        stall: null,
         products: [],
         searchText: null,
         cart: {
@@ -291,11 +281,13 @@
       }
     },
     created() {
+      this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = JSON.parse('{{ products | tojson }}')
-      let stall_ids = new Set()
-      this.products.map(p => stall_ids.add(p.stall))
 
-      console.log(stall_ids)
+      //let stall_ids = new Set()
+      //this.products.map(p => stall_ids.add(p.stall))
+
+      console.log(this.stall)
     }
   })
 </script>

From 35cf441d91f46828069f0d10fc0af50a61281173 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 16 Aug 2022 12:07:56 +0100
Subject: [PATCH 075/174] remove privatekey from stall

---
 lnbits/extensions/diagonalley/views.py | 43 ++++++++++++++------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 2ec75589..08c30428 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -3,11 +3,12 @@ from http import HTTPStatus
 from fastapi import Request
 from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
-from starlette.exceptions import HTTPException
-from starlette.responses import HTMLResponse
 
 from .crud import get_diagonalley_products, get_diagonalley_stall
 
@@ -30,29 +31,33 @@ async def display(request: Request, stall_id):
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
         )
+
+    stall = stall.dict()
+    del stall["privatekey"]
+    
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
         {
             "request": request,
-            "stall": stall.dict(),
+            "stall": stall,
             "products": [product.dict() for product in products]
         },
     )
 
-@diagonalley_ext.get("/{market_id}", response_class=HTMLResponse)
-async def display(request: Request, stall_id):
-    stalls = await get_diagonalley_stall(stall_id)
-    products = await get_diagonalley_products(stall_id)
+# @diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
+# async def display(request: Request, stall_id):
+#     stalls = await get_diagonalley_stall(stall_id)
+#     products = await get_diagonalley_products(stall_id)
 
-    if not stall:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
-        )
-    return diagonalley_renderer().TemplateResponse(
-        "diagonalley/stall.html",
-        {
-            "request": request,
-            "stall": stall.dict(),
-            "products": [product.dict() for product in products]
-        },
-    )
+#     if not stall:
+#         raise HTTPException(
+#             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
+#         )
+#     return diagonalley_renderer().TemplateResponse(
+#         "diagonalley/stall.html",
+#         {
+#             "request": request,
+#             "stall": stall.dict(),
+#             "products": [product.dict() for product in products]
+#         },
+#     )

From 777b9bef1ba4a8b16658a05f6a02d0e9e6bc1060 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 16 Aug 2022 12:08:27 +0100
Subject: [PATCH 076/174] place order flow WIP

---
 lnbits/extensions/diagonalley/crud.py       | 45 +++++++++++++++------
 lnbits/extensions/diagonalley/migrations.py |  9 ++---
 lnbits/extensions/diagonalley/models.py     | 21 ++++++++--
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index fbc1d332..b915c81d 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -13,11 +13,13 @@ from lnbits.settings import WALLET
 from . import db
 from .models import (
     Market,
+    OrderDetail,
     Orders,
     Products,
     Stalls,
     Zones,
     createOrder,
+    createOrderDetails,
     createProduct,
     createStalls,
     createZones,
@@ -208,38 +210,55 @@ async def delete_diagonalley_stall(stall_id: str) -> None:
 ###Orders
 
 
-async def create_diagonalley_order(data: createOrder) -> Orders:
+async def create_diagonalley_order(wallet_id: str, data: createOrder) -> Orders:
 
     order_id = urlsafe_short_hash()
     await db.execute(
         f"""
-            INSERT INTO diagonalley.orders (id, productid, wallet, product,
-            quantity, shippingzone, address, email, invoiceid, paid, shipped)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            INSERT INTO diagonalley.orders (id, wallet, shippingzone, address, email, total, invoiceid, paid, shipped)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
             """,
         (
             order_id,
-            data.productid,
-            data.wallet,
-            data.product,
-            data.quantity,
+            wallet_id,
             data.shippingzone,
             data.address,
             data.email,
+            data.total,
             data.invoiceid,
             False,
             False,
         ),
     )
-    # if db.type == SQLITE:
-    #     order_id = result._result_proxy.lastrowid
-    # else:
-    #     order_id = result[0]
-
+    
     link = await get_diagonalley_order(order_id)
     assert link, "Newly created link couldn't be retrieved"
     return link
 
+async def create_diagonalley_order_details(order_id: str, data: List[createOrderDetails]):
+    for item in data:
+        item_id = urlsafe_short_hash()
+        await db.execute(
+            """
+            INSERT INTO diagonalley.order_details (id, orderid, productid, quantity)
+            VALUES (?, ?, ?, ?)
+            """,
+            (
+                item_id,
+                order_id,
+                item.product_id,
+                item.quantity,
+            ),
+        )
+    order_details = await get_diagonalley_order_details(order_id)
+    return order_details
+
+async def get_diagonalley_order_details(order_id: str) -> List[OrderDetail]:
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.order_details WHERE order_id = ?", (order_id,)
+    )
+
+    return [OrderDetail(**row) for row in rows]
 
 async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
     row = await db.fetchone(
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index e994d723..8a65df8a 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -56,12 +56,12 @@ async def m001_initial(db):
         """
         CREATE TABLE diagonalley.orders (
             id {db.serial_primary_key},
-            productid TEXT NOT NULL,
-            usr TEXT NOT NULL,
-            pubkey TEXT NOT NULL,
+            wallet TEXT NOT NULL,
+            pubkey TEXT,
             shippingzone INTEGER NOT NULL,
             address TEXT NOT NULL,
             email TEXT NOT NULL,
+            total INTEGER NOT NULL,
             invoiceid TEXT NOT NULL,
             paid BOOLEAN NOT NULL,
             shipped BOOLEAN NOT NULL,
@@ -81,8 +81,7 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             orderid INTEGER NOT NULL REFERENCES {db.references_schema}orders (id)
             productid TEXT NOT NULL REFERENCES {db.references_schema}products (id),
-            quantity INTEGER NOT NULL,
-            total INTEGER NOT NULL 
+            quantity INTEGER NOT NULL
         );
     """
     )
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 4fbf04ff..737f2b4b 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -55,16 +55,29 @@ class Zones(BaseModel):
     cost: int
     countries: str
 
+class OrderDetail(BaseModel):
+    id: str
+    order_id: str
+    product_id: str
+    quantity: int
+
+class createOrderDetails(BaseModel):
+    product_id: str = Query(...)
+    quantity: int = Query(..., ge=1)
+
 
 class createOrder(BaseModel):
-    productid: str = Query(...)
-    stall: str = Query(...)
-    product: str = Query(...)
-    quantity: int = Query(..., ge=1)
+    wallet: str = Query(...)
+    pubkey: str = Query(None)
     shippingzone: int = Query(...)
     address: str = Query(...)
     email: str = Query(...)
+    total: int = Query(...)
     invoiceid: str = Query(...)
+    products: List[createOrderDetails]
+    # stall: str = Query(...)
+    # product: str = Query(...)
+    # quantity: int = Query(..., ge=1)
 
 
 class Orders(BaseModel):

From 58b046254ff1bfef39f6e8f4395f762247c8def1 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 16 Aug 2022 12:19:31 +0100
Subject: [PATCH 077/174] make format diagonalley

---
 lnbits/extensions/diagonalley/__init__.py     |    4 +-
 lnbits/extensions/diagonalley/crud.py         |   19 +-
 lnbits/extensions/diagonalley/migrations.py   |    1 -
 lnbits/extensions/diagonalley/models.py       |    4 +
 .../templates/diagonalley/_api_docs.html      |   42 +-
 .../templates/diagonalley/index.html          | 1916 +++++++++--------
 lnbits/extensions/diagonalley/views.py        |    5 +-
 lnbits/extensions/diagonalley/views_api.py    |   24 +-
 8 files changed, 1037 insertions(+), 978 deletions(-)

diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
index 23c02a5f..ec193e3a 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/diagonalley/__init__.py
@@ -1,10 +1,11 @@
 import asyncio
 
 from fastapi import APIRouter
+from starlette.staticfiles import StaticFiles
+
 from lnbits.db import Database
 from lnbits.helpers import template_renderer
 from lnbits.tasks import catch_everything_and_restart
-from starlette.staticfiles import StaticFiles
 
 db = Database("ext_diagonalley")
 
@@ -26,6 +27,7 @@ diagonalley_static_files = [
 #             )
 # else:
 
+
 def diagonalley_renderer():
     return template_renderer(["lnbits/extensions/diagonalley/templates"])
     # return template_renderer(["lnbits/extensions/diagonalley/templates"])
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index b915c81d..8016fd07 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -230,12 +230,15 @@ async def create_diagonalley_order(wallet_id: str, data: createOrder) -> Orders:
             False,
         ),
     )
-    
+
     link = await get_diagonalley_order(order_id)
     assert link, "Newly created link couldn't be retrieved"
     return link
 
-async def create_diagonalley_order_details(order_id: str, data: List[createOrderDetails]):
+
+async def create_diagonalley_order_details(
+    order_id: str, data: List[createOrderDetails]
+):
     for item in data:
         item_id = urlsafe_short_hash()
         await db.execute(
@@ -253,6 +256,7 @@ async def create_diagonalley_order_details(order_id: str, data: List[createOrder
     order_details = await get_diagonalley_order_details(order_id)
     return order_details
 
+
 async def get_diagonalley_order_details(order_id: str) -> List[OrderDetail]:
     rows = await db.fetchall(
         f"SELECT * FROM diagonalley.order_details WHERE order_id = ?", (order_id,)
@@ -260,6 +264,7 @@ async def get_diagonalley_order_details(order_id: str) -> List[OrderDetail]:
 
     return [OrderDetail(**row) for row in rows]
 
+
 async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
@@ -282,18 +287,18 @@ async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orde
 async def delete_diagonalley_order(order_id: str) -> None:
     await db.execute("DELETE FROM diagonalley.orders WHERE id = ?", (order_id,))
 
+
 ### Market/Marketplace
 
+
 async def get_diagonalley_markets(user: str) -> List[Market]:
-    rows = await db.fetchall(
-        'SELECT * FROM diagonalley.markets WHERE usr = ?', (user,)
-    )
+    rows = await db.fetchall("SELECT * FROM diagonalley.markets WHERE usr = ?", (user,))
     return [Market(**row) for row in rows]
 
 
 async def get_diagonalley_market(market_id: str) -> Optional[Market]:
     row = await db.fetchone(
-        'SELECT * FROM diagonalley.markets WHERE id = ?', (market_id,)
+        "SELECT * FROM diagonalley.markets WHERE id = ?", (market_id,)
     )
     Market(**row) if row else None
 
@@ -303,5 +308,3 @@ async def get_diagonalley_market_stalls(market_id: str):
         "SELECT * FROM diagonalley.market_stalls WHERE marketid = ?", (market_id,)
     )
     return [Stalls(**row) for row in rows]
-
-
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 8a65df8a..a7380b65 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -111,4 +111,3 @@ async def m001_initial(db):
         );
     """
     )
-    
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 737f2b4b..f07e9c80 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -55,12 +55,14 @@ class Zones(BaseModel):
     cost: int
     countries: str
 
+
 class OrderDetail(BaseModel):
     id: str
     order_id: str
     product_id: str
     quantity: int
 
+
 class createOrderDetails(BaseModel):
     product_id: str = Query(...)
     quantity: int = Query(..., ge=1)
@@ -95,11 +97,13 @@ class Orders(BaseModel):
     shipped: bool
     time: int
 
+
 class CreateMarket(BaseModel):
     usr: str = Query(...)
     name: str = Query(None)
     stalls: List[str] = Query(...)
 
+
 class Market(BaseModel):
     id: str
     usr: str
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html b/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
index 530c89e8..5418deba 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
@@ -9,26 +9,28 @@
       <h5 class="text-subtitle1 q-my-none">
         Diagon Alley: Decentralised Market-Stalls
       </h5>
-      <p>
-        Each Stall has its own keys!<br />
-        <ol>
-          <li>Create Shipping Zones you're willing to ship to</li>
-          <li>Create a Stall to list yiur products on</li>
-          <li>Create products to put on the Stall</li>
-          <li>List stalls on a simple frontend shop page, or point at Nostr shop client key</li>
-        </ol> 
-        Make a list of products to sell, point your list of products at a public
-        relay. Buyers browse your products on the relay, and pay you directly.
-        Ratings are managed by the relay. Your stall can be listed in multiple
-        relays, even over TOR, if you wish to be anonymous.<br />
-        More information on the
-        <a href="https://github.com/lnbits/Diagon-Alley"
-          >Diagon Alley Protocol</a
-        ><br />
-        <small>
-          Created by, <a href="https://github.com/benarc">Ben Arc</a></small
-        >
-      </p>
+      <p>Each Stall has its own keys!<br /></p>
+
+      <ol>
+        <li>Create Shipping Zones you're willing to ship to</li>
+        <li>Create a Stall to list yiur products on</li>
+        <li>Create products to put on the Stall</li>
+        <li>
+          List stalls on a simple frontend shop page, or point at Nostr shop
+          client key
+        </li>
+      </ol>
+      Make a list of products to sell, point your list of products at a public
+      relay. Buyers browse your products on the relay, and pay you directly.
+      Ratings are managed by the relay. Your stall can be listed in multiple
+      relays, even over TOR, if you wish to be anonymous.<br />
+      More information on the
+      <a href="https://github.com/lnbits/Diagon-Alley">Diagon Alley Protocol</a
+      ><br />
+      <small>
+        Created by, <a href="https://github.com/benarc">Ben Arc</a></small
+      >
+      <!-- </p> -->
     </q-card-section>
   </q-card>
 </q-expansion-item>
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 893830a9..5482cd3f 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -28,7 +28,7 @@
           label="Description"
         ></q-input>
         <!-- <div class="row"> -->
-          <!-- <div class="col-5">
+        <!-- <div class="col-5">
             <q-select
               filled
               dense
@@ -39,24 +39,24 @@
               class="q-pr-sm"
             ></q-select>
           </div> -->
-          <!-- <div class="col-7"> -->
-            <q-select
-              filled
-              multiple
-              dense
-              emit-value
-              v-model.trim="productDialog.data.categories"
-              use-input
-              use-chips
-              multiple
-              hide-dropdown-icon
-              input-debounce="0"
-              new-value-mode="add-unique"
-              label="Categories"
-              placeholder="crafts,robots,etc"
-              hint="Hit Enter to add"
-            ></q-select>
-          <!-- </div> -->
+        <!-- <div class="col-7"> -->
+        <q-select
+          filled
+          multiple
+          dense
+          emit-value
+          v-model.trim="productDialog.data.categories"
+          use-input
+          use-chips
+          multiple
+          hide-dropdown-icon
+          input-debounce="0"
+          new-value-mode="add-unique"
+          label="Categories"
+          placeholder="crafts,robots,etc"
+          hint="Hit Enter to add"
+        ></q-select>
+        <!-- </div> -->
         <!-- </div> -->
 
         <q-file
@@ -118,7 +118,12 @@
             >Create Product</q-btn
           >
 
-          <q-btn v-close-popup flat @click="resetDialog('productDialog')" color="grey" class="q-ml-auto"
+          <q-btn
+            v-close-popup
+            flat
+            @click="resetDialog('productDialog')"
+            color="grey"
+            class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
@@ -162,7 +167,12 @@
             >Create Shipping Zone</q-btn
           >
 
-          <q-btn v-close-popup flat @click="resetDialog('zoneDialog')" color="grey" class="q-ml-auto"
+          <q-btn
+            v-close-popup
+            flat
+            @click="resetDialog('zoneDialog')"
+            color="grey"
+            class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
@@ -174,10 +184,10 @@
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="sendShopFormData" class="q-gutter-md">
         <q-toggle
-        label="Activate shop"
-        color="primary"
-        v-model="marketDialog.data.activate"
-      ></q-toggle>
+          label="Activate shop"
+          color="primary"
+          v-model="marketDialog.data.activate"
+        ></q-toggle>
         <q-select
           filled
           dense
@@ -205,7 +215,12 @@
             >Launch</q-btn
           >
 
-          <q-btn v-close-popup flat @click="resetDialog('marketDialog')" color="grey" class="q-ml-auto"
+          <q-btn
+            v-close-popup
+            flat
+            @click="resetDialog('marketDialog')"
+            color="grey"
+            class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
@@ -284,7 +299,9 @@
           v-model.trim="stallDialog.data.nostrShops"
           label="Nostr shop public keys (seperate by comma)"
         ></q-input> -->
-        <p><strong><small>Nostr support coming soon!</small></strong></p>
+        <p>
+          <strong><small>Nostr support coming soon!</small></strong>
+        </p>
         <div class="row q-mt-lg">
           <q-btn
             v-if="stallDialog.data.id"
@@ -302,7 +319,12 @@
             type="submit"
             >Create Store</q-btn
           >
-          <q-btn v-close-popup flat @click="resetDialog('stallDialog')" color="grey" class="q-ml-auto"
+          <q-btn
+            v-close-popup
+            flat
+            @click="resetDialog('stallDialog')"
+            color="grey"
+            class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
@@ -313,33 +335,50 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-      
-        <q-btn unelevated v-if="stalls.length > 0" color="primary" @click="productDialog.show = true"
+        <q-btn
+          unelevated
+          v-if="stalls.length > 0"
+          color="primary"
+          @click="productDialog.show = true"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
-        <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s), then create a stall.')"
+        <q-btn
+          unelevated
+          v-else
+          color="primary"
+          @click="errorMessage('First set shipping zone(s), then create a stall.')"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
-        <q-btn unelevated v-if="zones.length > 0" color="primary" @click="openStallDialog()"
+        <q-btn
+          unelevated
+          v-if="zones.length > 0"
+          color="primary"
+          @click="openStallDialog()"
           >+ Store
           <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
         >
-        <q-btn unelevated v-else color="primary" @click="errorMessage('First set shipping zone(s).')"
+        <q-btn
+          unelevated
+          v-else
+          color="primary"
+          @click="errorMessage('First set shipping zone(s).')"
           >+ Store
           <q-tooltip> Create a store to list products on </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="shopDialog.show = true"
           >Launch frontend shop (not Nostr)
-          <q-tooltip> Makes a simple frontend shop for your stalls</q-tooltip></q-btn
+          <q-tooltip>
+            Makes a simple frontend shop for your stalls</q-tooltip
+          ></q-btn
         >
-      
       </q-card-section>
     </q-card>
-    
-    <q-card> <!-- ORDERS TABLE -->
+
+    <q-card>
+      <!-- ORDERS TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -403,7 +442,8 @@
       </q-card-section>
     </q-card>
 
-    <q-card> <!-- PRODUCTS TABLE -->
+    <q-card>
+      <!-- PRODUCTS TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -482,8 +522,9 @@
         </q-table>
       </q-card-section>
     </q-card>
-    
-    <q-card> <!-- STORES TABLE -->
+
+    <q-card>
+      <!-- STORES TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -555,8 +596,9 @@
         </q-table>
       </q-card-section>
     </q-card>
-    
-    <q-card> <!-- ZONES TABLE -->
+
+    <q-card>
+      <!-- ZONES TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -632,14 +674,18 @@
       <q-card-section>
         <h6 class="text-subtitle1 q-my-none">Messages</h6>
       </q-card-section>
-      <q-card-section class="q-pa-none" >
+      <q-card-section class="q-pa-none">
         <q-separator></q-separator>
 
-        <div class="column q-ma-md q-pb-lg" 
-         style="height: 350px">
+        <div class="column q-ma-md q-pb-lg" style="height: 350px">
           <div class="col q-pb-md">
-            <q-select v-model="customerKey" style="width: 80%;"
-        :options="customerKeys" label="Customers" @input="getMessages(customerKey)"></q-select>
+            <q-select
+              v-model="customerKey"
+              style="width: 80%"
+              :options="customerKeys"
+              label="Customers"
+              @input="getMessages(customerKey)"
+            ></q-select>
           </div>
           <div class="col-8 q-px-md">
             <div v-for="message in customerMessages">
@@ -648,14 +694,11 @@
                 :text="[message[1]]"
                 sent
               ></q-chat-message>
-              <q-chat-message
-                v-else
-                :text="[message[1]]"
-              ></q-chat-message>
-          </div>
+              <q-chat-message v-else :text="[message[1]]"></q-chat-message>
+            </div>
           </div>
           <div class="col on-right" style="width: 90%">
-            <q-input >
+            <q-input>
               <template v-slot:after>
                 <q-btn round dense flat icon="send" />
               </template>
@@ -665,934 +708,935 @@
       </q-card-section>
     </q-card>
   </div>
-  </div>
-</div>
 </div>
+<!-- </div>
+</div> -->
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
 <script>
+  Vue.component(VueQrcode.name, VueQrcode)
 
-Vue.component(VueQrcode.name, VueQrcode)
+  const pica = window.pica()
 
-const pica = window.pica()
+  const mapStalls = obj => {
+    obj._data = _.clone(obj)
+    return obj
+  }
+  const mapProducts = obj => {
+    obj._data = _.clone(obj)
+    console.log(obj)
+    return obj
+  }
+  const mapZone = obj => {
+    obj._data = _.clone(obj)
+    return obj
+  }
+  const mapOrders = obj => {
+    obj._data = _.clone(obj)
+    return obj
+  }
+  const mapKeys = obj => {
+    obj._data = _.clone(obj)
+    return obj
+  }
 
-const mapStalls = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-const mapProducts = obj => {
-  obj._data = _.clone(obj)
-  console.log(obj)
-  return obj
-}
-const mapZone = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-const mapOrders = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
-const mapKeys = obj => {
-  obj._data = _.clone(obj)
-  return obj
-}
+  const humanReadableZones = zones => {
+    return zones.map(z => `${z.id} - ${z.countries}`)
+  }
 
-const humanReadableZones = (zones) => {
-  return zones.map(z => `${z.id} - ${z.countries}`)
-}
-
-new Vue({
-  el: '#vue',
-  mixins: [windowMixin],
-  data: function () {
-    return {
-      products: [],
-      orders: [],
-      stalls: [],
-      zones: [],
-      zoneOptions: [],
-      customerKeys: [],
-      customerKey: '',
-      customerMessages: {},
-      shippedModel: false,
-      shippingZoneOptions: [
-        'Worldwide',
-        'Europe',
-        'Australia',
-        'Austria',
-        'Belgium',
-        'Brazil',
-        'Canada',
-        'Denmark',
-        'Finland',
-        'France',
-        'Germany',
-        'Greece',
-        'Hong Kong',
-        'Hungary',
-        'Ireland',
-        'Indonesia',
-        'Israel',
-        'Italy',
-        'Japan',
-        'Kazakhstan',
-        'Korea',
-        'Luxembourg',
-        'Malaysia',
-        'Mexico',
-        'Netherlands',
-        'New Zealand',
-        'Norway',
-        'Poland',
-        'Portugal',
-        'Russia',
-        'Saudi Arabia',
-        'Singapore',
-        'Spain',
-        'Sweden',
-        'Switzerland',
-        'Thailand',
-        'Turkey',
-        'Ukraine',
-        'United Kingdom**',
-        'United States***',
-        'Vietnam',
-        'China'
-      ],
-      categories: [
-        'Fashion (clothing and accessories)',
-        'Health (and beauty)',
-        'Toys (and baby equipment)',
-        'Media (Books and CDs)',
-        'Groceries (Food and Drink)',
-        'Technology (Phones and Computers)',
-        'Home (furniture and accessories)',
-        'Gifts (flowers, cards, etc)',
-        'Adult',
-        'Other'
-      ],
-      relayOptions: [
-        'wss://nostr-relay.herokuapp.com/ws',
-        'wss://nostr-relay.bigsun.xyz/ws',
-        'wss://freedom-relay.herokuapp.com/ws'
-      ],
-      label: '',
-      ordersTable: {
-        columns: [
-          {
-            name: 'product',
-            align: 'left',
-            label: 'Product',
-            field: 'product'
-          },
-          {
-            name: 'quantity',
-            align: 'left',
-            label: 'Quantity',
-            field: 'quantity'
-          },
-          {
-            name: 'address',
-            align: 'left',
-            label: 'Address',
-            field: 'address'
-          },
-          {
-            name: 'invoiceid',
-            align: 'left',
-            label: 'InvoiceID',
-            field: 'invoiceid'
-          },
-          {name: 'paid', align: 'left', label: 'Paid', field: 'paid'},
-          {name: 'shipped', align: 'left', label: 'Shipped', field: 'shipped'}
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        products: [],
+        orders: [],
+        stalls: [],
+        zones: [],
+        zoneOptions: [],
+        customerKeys: [],
+        customerKey: '',
+        customerMessages: {},
+        shippedModel: false,
+        shippingZoneOptions: [
+          'Worldwide',
+          'Europe',
+          'Australia',
+          'Austria',
+          'Belgium',
+          'Brazil',
+          'Canada',
+          'Denmark',
+          'Finland',
+          'France',
+          'Germany',
+          'Greece',
+          'Hong Kong',
+          'Hungary',
+          'Ireland',
+          'Indonesia',
+          'Israel',
+          'Italy',
+          'Japan',
+          'Kazakhstan',
+          'Korea',
+          'Luxembourg',
+          'Malaysia',
+          'Mexico',
+          'Netherlands',
+          'New Zealand',
+          'Norway',
+          'Poland',
+          'Portugal',
+          'Russia',
+          'Saudi Arabia',
+          'Singapore',
+          'Spain',
+          'Sweden',
+          'Switzerland',
+          'Thailand',
+          'Turkey',
+          'Ukraine',
+          'United Kingdom**',
+          'United States***',
+          'Vietnam',
+          'China'
         ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      productsTable: {
-        columns: [
-          {
-            name: 'stall',
-            align: 'left',
-            label: 'Store',
-            field: 'stall'
-          },
-          {
-            name: 'product',
-            align: 'left',
-            label: 'Product',
-            field: 'product'
-          },
-          {
-            name: 'description',
-            align: 'left',
-            label: 'Description',
-            field: 'description'
-          },
-          {
-            name: 'categories',
-            align: 'left',
-            label: 'Categories',
-            field: 'categories'
-          },
-          {name: 'price', align: 'left', label: 'Price', field: 'price'},
-          {
-            name: 'quantity',
-            align: 'left',
-            label: 'Quantity',
-            field: 'quantity'
-          },
-          {name: 'id', align: 'left', label: 'ID', field: 'id'}
+        categories: [
+          'Fashion (clothing and accessories)',
+          'Health (and beauty)',
+          'Toys (and baby equipment)',
+          'Media (Books and CDs)',
+          'Groceries (Food and Drink)',
+          'Technology (Phones and Computers)',
+          'Home (furniture and accessories)',
+          'Gifts (flowers, cards, etc)',
+          'Adult',
+          'Other'
         ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      stallTable: {
-        columns: [
-          {
-            name: 'id',
-            align: 'left',
-            label: 'ID',
-            field: 'id'
-          },
-          {
-            name: 'name',
-            align: 'left',
-            label: 'Name',
-            field: 'name'
-          },
-          {
-            name: 'wallet',
-            align: 'left',
-            label: 'Wallet',
-            field: 'wallet'
-          },
-          {
-            name: 'publickey',
-            align: 'left',
-            label: 'Public key',
-            field: 'publickey'
-          },
-          {
-            name: 'privatekey',
-            align: 'left',
-            label: 'Private key',
-            field: 'privatekey'
+        relayOptions: [
+          'wss://nostr-relay.herokuapp.com/ws',
+          'wss://nostr-relay.bigsun.xyz/ws',
+          'wss://freedom-relay.herokuapp.com/ws'
+        ],
+        label: '',
+        ordersTable: {
+          columns: [
+            {
+              name: 'product',
+              align: 'left',
+              label: 'Product',
+              field: 'product'
+            },
+            {
+              name: 'quantity',
+              align: 'left',
+              label: 'Quantity',
+              field: 'quantity'
+            },
+            {
+              name: 'address',
+              align: 'left',
+              label: 'Address',
+              field: 'address'
+            },
+            {
+              name: 'invoiceid',
+              align: 'left',
+              label: 'InvoiceID',
+              field: 'invoiceid'
+            },
+            {name: 'paid', align: 'left', label: 'Paid', field: 'paid'},
+            {name: 'shipped', align: 'left', label: 'Shipped', field: 'shipped'}
+          ],
+          pagination: {
+            rowsPerPage: 10
           }
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      zonesTable: {
-        columns: [
-          {
-            name: 'id',
-            align: 'left',
-            label: 'ID',
-            field: 'id'
-          },
-          {
-            name: 'countries',
-            align: 'left',
-            label: 'Countries',
-            field: 'countries'
-          },
-          {
-            name: 'cost',
-            align: 'left',
-            label: 'Cost',
-            field: 'cost'
+        },
+        productsTable: {
+          columns: [
+            {
+              name: 'stall',
+              align: 'left',
+              label: 'Store',
+              field: 'stall'
+            },
+            {
+              name: 'product',
+              align: 'left',
+              label: 'Product',
+              field: 'product'
+            },
+            {
+              name: 'description',
+              align: 'left',
+              label: 'Description',
+              field: 'description'
+            },
+            {
+              name: 'categories',
+              align: 'left',
+              label: 'Categories',
+              field: 'categories'
+            },
+            {name: 'price', align: 'left', label: 'Price', field: 'price'},
+            {
+              name: 'quantity',
+              align: 'left',
+              label: 'Quantity',
+              field: 'quantity'
+            },
+            {name: 'id', align: 'left', label: 'ID', field: 'id'}
+          ],
+          pagination: {
+            rowsPerPage: 10
           }
-        ],
-        pagination: {
-          rowsPerPage: 10
-        }
-      },
-      productDialog: {
-        show: false,
-        data: {}
-      },
-      stallDialog: {
-        show: false,
-        data: {}
-      },
-      zoneDialog: {
-        show: false,
-        data: {countries:[]}
-      },
-      marketDialog: {
-        show: false,
-        data: {activate: false}
-      },
-      orderDialog: {
-        show: false,
-        data: {}
-      },
-      relayDialog: {
-        show: false,
-        data: {}
-      }
-    }
-  },
-  computed: {
-    categoryOther: function () {
-      cats = trim(this.productDialog.data.categories.split(','))
-      for (let i = 0; i < cats.length; i++) {
-        if (cats[i] == 'Others') {
-          return true
+        },
+        stallTable: {
+          columns: [
+            {
+              name: 'id',
+              align: 'left',
+              label: 'ID',
+              field: 'id'
+            },
+            {
+              name: 'name',
+              align: 'left',
+              label: 'Name',
+              field: 'name'
+            },
+            {
+              name: 'wallet',
+              align: 'left',
+              label: 'Wallet',
+              field: 'wallet'
+            },
+            {
+              name: 'publickey',
+              align: 'left',
+              label: 'Public key',
+              field: 'publickey'
+            },
+            {
+              name: 'privatekey',
+              align: 'left',
+              label: 'Private key',
+              field: 'privatekey'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        },
+        zonesTable: {
+          columns: [
+            {
+              name: 'id',
+              align: 'left',
+              label: 'ID',
+              field: 'id'
+            },
+            {
+              name: 'countries',
+              align: 'left',
+              label: 'Countries',
+              field: 'countries'
+            },
+            {
+              name: 'cost',
+              align: 'left',
+              label: 'Cost',
+              field: 'cost'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        },
+        productDialog: {
+          show: false,
+          data: {}
+        },
+        stallDialog: {
+          show: false,
+          data: {}
+        },
+        zoneDialog: {
+          show: false,
+          data: {countries: []}
+        },
+        marketDialog: {
+          show: false,
+          data: {activate: false}
+        },
+        orderDialog: {
+          show: false,
+          data: {}
+        },
+        relayDialog: {
+          show: false,
+          data: {}
         }
       }
-      return false
-    }
-  },
-  methods: {
-    resetDialog(dialog){
-      this[dialog].show = false
-      this[dialog].data = {}
     },
-    generateKeys: function(){
-      var self = this
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/keys',
-          self.g.user.wallets[0].adminkey
-        )
-        .then(function (response) {
-          if (response.data) {
-            self.keys = response.data.map(mapKeys)
+    computed: {
+      categoryOther: function () {
+        cats = trim(this.productDialog.data.categories.split(','))
+        for (let i = 0; i < cats.length; i++) {
+          if (cats[i] == 'Others') {
+            return true
           }
-        })
-        .catch(function (error) {
+        }
+        return false
+      }
+    },
+    methods: {
+      resetDialog(dialog) {
+        this[dialog].show = false
+        this[dialog].data = {}
+      },
+      generateKeys: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/diagonalley/api/v1/keys',
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.keys = response.data.map(mapKeys)
+            }
+          })
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
-    },
-    restoreKeys: function(){
-      
-    },
-    capitalizeFirstLetter: function (string) {
-      return string.charAt(0).toUpperCase() + string.slice(1);
-    },
-    errorMessage: function (error) {
-      this.$q.notify({
-        color: 'primary',
-        message: error
-      })
-    },
-    ////////////////////////////////////////
-    ///////////SUPPORT MESSAGES/////////////
-    ////////////////////////////////////////
-    getMessages: function (customerKey) {
-      var self = this
-      messages = []
-      messages.push(['in', 'blah blah'])
-      messages.push(['out', 'blah blah'])
-      self.customerMessages = messages
-    },
-    ////////////////////////////////////////
-    ////////////////STALLS//////////////////
-    ////////////////////////////////////////
-    getStalls: function () {
-      console.log(this.g.user)
-      var self = this
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/stalls?all_wallets=true',
-          self.g.user.wallets[0].adminkey
-        )
-        .then(function (response) {
-          if (response.data) {
-            self.stalls = response.data.map(mapStalls)
-            console.log(self.stalls)
-          }
+      },
+      restoreKeys: function () {},
+      capitalizeFirstLetter: function (string) {
+        return string.charAt(0).toUpperCase() + string.slice(1)
+      },
+      errorMessage: function (error) {
+        this.$q.notify({
+          color: 'primary',
+          message: error
         })
-        .catch(function (error) {
+      },
+      ////////////////////////////////////////
+      ///////////SUPPORT MESSAGES/////////////
+      ////////////////////////////////////////
+      getMessages: function (customerKey) {
+        var self = this
+        messages = []
+        messages.push(['in', 'blah blah'])
+        messages.push(['out', 'blah blah'])
+        self.customerMessages = messages
+      },
+      ////////////////////////////////////////
+      ////////////////STALLS//////////////////
+      ////////////////////////////////////////
+      getStalls: function () {
+        console.log(this.g.user)
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/diagonalley/api/v1/stalls?all_wallets=true',
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.stalls = response.data.map(mapStalls)
+              console.log(self.stalls)
+            }
+          })
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
-    },
-    openStallDialog: function () {
-      this.zoneOptions = humanReadableZones(this.zones)
-      this.stallDialog.show = true
-    },
-    openStallUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.stalls, {id: linkId})
-      this.zoneOptions = humanReadableZones(this.zones)
-      this.stallDialog.data = _.clone(link._data)
-      let shippingzones = this.zoneOptions.filter(z => this.stallDialog.data.shippingzones.split(",").includes(z.split("-")[0].trim()))
-        
-      this.stallDialog.data.shippingzones = shippingzones//this.stallDialog.data.shippingzones.split(",")
-
-      console.log(this.stallDialog.data)
-      //let zones = this.zoneOptions
-      //  .filter(z => z.id == )
-      this.stallDialog.show = true
-    },
-    sendStallFormData: function () {
-      let data = {
-        name: this.stallDialog.data.name,
-        wallet: this.stallDialog.data.wallet,
-        publickey: this.stallDialog.data.publickey,
-        privatekey: this.stallDialog.data.privatekey,
-        relays: this.stallDialog.data.relays,
-        shippingzones: this.stallDialog.data.shippingzones
-          .map(z => z.split("-")[0].trim())
-          .toString()
-      }
-      if (this.stallDialog.data.id) {
-        this.stallDialog.data = {...this.stallDialog.data, ...data}
-        this.updateStall(this.stallDialog.data)
-      } else {
-        this.createStall(data)
-      }
-    },
-    updateStall: function (data) {
-      console.log(data)
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/stalls/' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.stallDialog.data.wallet
-          }).inkey,
-          data
+      },
+      openStallDialog: function () {
+        this.zoneOptions = humanReadableZones(this.zones)
+        this.stallDialog.show = true
+      },
+      openStallUpdateDialog: function (linkId) {
+        var self = this
+        var link = _.findWhere(self.stalls, {id: linkId})
+        this.zoneOptions = humanReadableZones(this.zones)
+        this.stallDialog.data = _.clone(link._data)
+        let shippingzones = this.zoneOptions.filter(z =>
+          this.stallDialog.data.shippingzones
+            .split(',')
+            .includes(z.split('-')[0].trim())
         )
-        .then(function (response) {
-          self.stalls = _.reject(self.stalls, function (obj) {
-            return obj.id == data.id
+
+        this.stallDialog.data.shippingzones = shippingzones //this.stallDialog.data.shippingzones.split(",")
+
+        console.log(this.stallDialog.data)
+        //let zones = this.zoneOptions
+        //  .filter(z => z.id == )
+        this.stallDialog.show = true
+      },
+      sendStallFormData: function () {
+        let data = {
+          name: this.stallDialog.data.name,
+          wallet: this.stallDialog.data.wallet,
+          publickey: this.stallDialog.data.publickey,
+          privatekey: this.stallDialog.data.privatekey,
+          relays: this.stallDialog.data.relays,
+          shippingzones: this.stallDialog.data.shippingzones
+            .map(z => z.split('-')[0].trim())
+            .toString()
+        }
+        if (this.stallDialog.data.id) {
+          this.stallDialog.data = {...this.stallDialog.data, ...data}
+          this.updateStall(this.stallDialog.data)
+        } else {
+          this.createStall(data)
+        }
+      },
+      updateStall: function (data) {
+        console.log(data)
+        var self = this
+        LNbits.api
+          .request(
+            'PUT',
+            '/diagonalley/api/v1/stalls/' + data.id,
+            _.findWhere(self.g.user.wallets, {
+              id: self.stallDialog.data.wallet
+            }).inkey,
+            data
+          )
+          .then(function (response) {
+            self.stalls = _.reject(self.stalls, function (obj) {
+              return obj.id == data.id
+            })
+            self.stalls.push(mapStalls(response.data))
+            self.resetDialog('stallDialog')
           })
-          self.stalls.push(mapStalls(response.data))
-          self.resetDialog('stallDialog')
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createStall: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/stalls',
-          _.findWhere(self.g.user.wallets, {
-            id: self.stallDialog.data.wallet
-          }).inkey,
-          data
-        )
-        .then(function (response) {
-          self.stalls.push(mapStalls(response.data))
-          self.resetDialog('stallDialog')
-          //self.stallDialog.show = false
-          //self.stallDialog.data = {}
-          //data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteStall: function (stallId) {
-      var self = this
-      var stall = _.findWhere(self.stalls, {id: stallId})
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      createStall: function (data) {
+        var self = this
+        LNbits.api
+          .request(
+            'POST',
+            '/diagonalley/api/v1/stalls',
+            _.findWhere(self.g.user.wallets, {
+              id: self.stallDialog.data.wallet
+            }).inkey,
+            data
+          )
+          .then(function (response) {
+            self.stalls.push(mapStalls(response.data))
+            self.resetDialog('stallDialog')
+            //self.stallDialog.show = false
+            //self.stallDialog.data = {}
+            //data = {}
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      deleteStall: function (stallId) {
+        var self = this
+        var stall = _.findWhere(self.stalls, {id: stallId})
 
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Stall link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/stalls/' + stallId,
-              _.findWhere(self.g.user.wallets, {id: stall.wallet}).adminkey
-            )
-            .then(function (response) {
-              self.stalls = _.reject(self.stalls, function (obj) {
-                return obj.id == stallId
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this Stall link?')
+          .onOk(function () {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/diagonalley/api/v1/stalls/' + stallId,
+                _.findWhere(self.g.user.wallets, {id: stall.wallet}).adminkey
+              )
+              .then(function (response) {
+                self.stalls = _.reject(self.stalls, function (obj) {
+                  return obj.id == stallId
+                })
               })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportStallsCSV: function () {
-      LNbits.utils.exportCSV(this.stallsTable.columns, this.stalls)
-    },
-    ////////////////////////////////////////
-    ///////////////PRODUCTS/////////////////
-    ////////////////////////////////////////
-    getProducts: function () {
-      var self = this
+              .catch(function (error) {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      exportStallsCSV: function () {
+        LNbits.utils.exportCSV(this.stallsTable.columns, this.stalls)
+      },
+      ////////////////////////////////////////
+      ///////////////PRODUCTS/////////////////
+      ////////////////////////////////////////
+      getProducts: function () {
+        var self = this
 
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/products?all_stalls=true',
-          self.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          console.log("RESP DATA", response.data)
-          if (response.data) {
-            self.products = response.data.map(mapProducts)
-          }
-        })
-        .catch(function (error) {
+        LNbits.api
+          .request(
+            'GET',
+            '/diagonalley/api/v1/products?all_stalls=true',
+            self.g.user.wallets[0].inkey
+          )
+          .then(function (response) {
+            console.log('RESP DATA', response.data)
+            if (response.data) {
+              self.products = response.data.map(mapProducts)
+            }
+          })
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
-    },
-    openProductUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.products, {id: linkId})
+      },
+      openProductUpdateDialog: function (linkId) {
+        var self = this
+        var link = _.findWhere(self.products, {id: linkId})
 
-      self.productDialog.data = _.clone(link._data)
-      self.productDialog.data.categories = self.productDialog.data.categories.split(",")
-      
-      self.productDialog.show = true
-    },
-    sendProductFormData: function () {
-      let _data = {...this.productDialog.data}
-      var data = {
-        stall: _data.stall,
-        product: _data.product,
-        categories: _data.categories && _data.categories.toString(),
-        description: _data.description,
-        image: _data.image,
-        price: _data.price,
-        quantity: _data.quantity
-      }
-      if (_data.id) {
-        data.id = _data.id
-        this.updateProduct(data)
-      } else {
-        this.createProduct(data)
-      }
-    },
-    imageAdded(file) {
-      let blobURL = URL.createObjectURL(file)
-      let image = new Image()
-      image.src = blobURL
-      image.onload = async () => {
-        let canvas = document.createElement('canvas')
-        canvas.setAttribute('width', 760)
-        canvas.setAttribute('height', 490)
-        await pica.resize(image, canvas, {
-          quality: 0,
-          alpha: true,
-          unsharpAmount: 95,
-          unsharpRadius: 0.9,
-          unsharpThreshold: 70
-        })
-        this.productDialog.data.image = canvas.toDataURL()
+        self.productDialog.data = _.clone(link._data)
+        self.productDialog.data.categories = self.productDialog.data.categories.split(
+          ','
+        )
+
+        self.productDialog.show = true
+      },
+      sendProductFormData: function () {
+        let _data = {...this.productDialog.data}
+        var data = {
+          stall: _data.stall,
+          product: _data.product,
+          categories: _data.categories && _data.categories.toString(),
+          description: _data.description,
+          image: _data.image,
+          price: _data.price,
+          quantity: _data.quantity
+        }
+        if (_data.id) {
+          data.id = _data.id
+          this.updateProduct(data)
+        } else {
+          this.createProduct(data)
+        }
+      },
+      imageAdded(file) {
+        let blobURL = URL.createObjectURL(file)
+        let image = new Image()
+        image.src = blobURL
+        image.onload = async () => {
+          let canvas = document.createElement('canvas')
+          canvas.setAttribute('width', 760)
+          canvas.setAttribute('height', 490)
+          await pica.resize(image, canvas, {
+            quality: 0,
+            alpha: true,
+            unsharpAmount: 95,
+            unsharpRadius: 0.9,
+            unsharpThreshold: 70
+          })
+          this.productDialog.data.image = canvas.toDataURL()
+          this.productDialog = {...this.productDialog}
+        }
+      },
+      imageCleared() {
+        this.productDialog.data.image = null
         this.productDialog = {...this.productDialog}
-      }
-    },
-    imageCleared() {
-      this.productDialog.data.image = null
-      this.productDialog = {...this.productDialog}
-    },
-    updateProduct: function (data) {
-      var self = this
-      let wallet = _.findWhere(this.stalls, {
-        id: self.productDialog.data.stall
-      }).wallet
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/products/' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: wallet
-          }).inkey,
-          data
-        )
-        .then(function (response) {
-          self.products = _.reject(self.products, function (obj) {
-            return obj.id == data.id
+      },
+      updateProduct: function (data) {
+        var self = this
+        let wallet = _.findWhere(this.stalls, {
+          id: self.productDialog.data.stall
+        }).wallet
+        LNbits.api
+          .request(
+            'PUT',
+            '/diagonalley/api/v1/products/' + data.id,
+            _.findWhere(self.g.user.wallets, {
+              id: wallet
+            }).inkey,
+            data
+          )
+          .then(function (response) {
+            self.products = _.reject(self.products, function (obj) {
+              return obj.id == data.id
+            })
+            self.products.push(mapProducts(response.data))
+            self.resetDialog('productDialog')
+            //self.productDialog.show = false
+            //self.productDialog.data = {}
           })
-          self.products.push(mapProducts(response.data))
-          self.resetDialog('productDialog')
-          //self.productDialog.show = false
-          //self.productDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createProduct: function (data) {
-      let self = this
-      const walletId = _.findWhere(this.stalls, {id: data.stall}).wallet
-      
-      console.log("DATA", walletId, data)
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/products',
-          _.findWhere(self.g.user.wallets, {id: walletId}).inkey,
-          data
-        )
-        .then((response) => {
-          console.log(response)
-          self.products.push(mapProducts(response.data))
-          self.resetDialog('productDialog')
-        })
-        .catch((error) => {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteProduct: function (productId) {
-      const product = _.findWhere(this.products, {id: productId})
-      const walletId = _.findWhere(this.stalls, {id: product.stall}).wallet
-      
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this products link?')
-        .onOk(() => {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/products/' + productId,
-              _.findWhere(this.g.user.wallets, {id: walletId}).adminkey
-            )
-            .then(() => {
-              this.products = _.reject(this.products, (obj) => {
-                return obj.id == productId
-              })
-            })
-            .catch((error) => {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportProductsCSV: function () {
-      LNbits.utils.exportCSV(this.productsTable.columns, this.products)
-    },
-    ////////////////////////////////////////
-    //////////////////ZONE//////////////////
-    ////////////////////////////////////////
-    getZones: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/zones',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          if (response.data) {
-            console.log(response)
-            self.zones = response.data.map(mapZone)
-            
-          }
-        })
-        .catch(function (error) {
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
-    },
-    openZoneUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.zones, {id: linkId})
-      countriesArray = link._data.countries.split(",")
-      for (let i = 0; i < countriesArray.length; i++) {
-        countriesArray[i] = self.capitalizeFirstLetter(countriesArray[i])
-      }
-      link._data.countries = countriesArray
-      this.zoneDialog.data = _.clone(link._data)
-      this.zoneDialog.show = true
-    },
-    sendZoneFormData: function () {
-    var data = {
+      },
+      createProduct: function (data) {
+        let self = this
+        const walletId = _.findWhere(this.stalls, {id: data.stall}).wallet
+
+        console.log('DATA', walletId, data)
+        LNbits.api
+          .request(
+            'POST',
+            '/diagonalley/api/v1/products',
+            _.findWhere(self.g.user.wallets, {id: walletId}).inkey,
+            data
+          )
+          .then(response => {
+            console.log(response)
+            self.products.push(mapProducts(response.data))
+            self.resetDialog('productDialog')
+          })
+          .catch(error => {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      deleteProduct: function (productId) {
+        const product = _.findWhere(this.products, {id: productId})
+        const walletId = _.findWhere(this.stalls, {id: product.stall}).wallet
+
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this products link?')
+          .onOk(() => {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/diagonalley/api/v1/products/' + productId,
+                _.findWhere(this.g.user.wallets, {id: walletId}).adminkey
+              )
+              .then(() => {
+                this.products = _.reject(this.products, obj => {
+                  return obj.id == productId
+                })
+              })
+              .catch(error => {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      exportProductsCSV: function () {
+        LNbits.utils.exportCSV(this.productsTable.columns, this.products)
+      },
+      ////////////////////////////////////////
+      //////////////////ZONE//////////////////
+      ////////////////////////////////////////
+      getZones: function () {
+        var self = this
+
+        LNbits.api
+          .request(
+            'GET',
+            '/diagonalley/api/v1/zones',
+            this.g.user.wallets[0].inkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              console.log(response)
+              self.zones = response.data.map(mapZone)
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      openZoneUpdateDialog: function (linkId) {
+        var self = this
+        var link = _.findWhere(self.zones, {id: linkId})
+        countriesArray = link._data.countries.split(',')
+        for (let i = 0; i < countriesArray.length; i++) {
+          countriesArray[i] = self.capitalizeFirstLetter(countriesArray[i])
+        }
+        link._data.countries = countriesArray
+        this.zoneDialog.data = _.clone(link._data)
+        this.zoneDialog.show = true
+      },
+      sendZoneFormData: function () {
+        var data = {
           countries: String(this.zoneDialog.data.countries),
           cost: parseInt(this.zoneDialog.data.cost)
-    }
-      if (this.zoneDialog.data.id) {
-        data.id = this.zoneDialog.data.id
-        this.updateZone(data)
-      } else {
-        this.createZone(data)
-      }
-    },
-    updateZone: function (data) {
-      console.log(data)
-      var self = this
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/zones/' + data.id,
-          self.g.user.wallets[0].adminkey,
-          data
-        )
-        .then(function (response) {
-          console.log(response)
-          self.zones = _.reject(self.zones, function (obj) {
-            return obj.id == data.id
+        }
+        if (this.zoneDialog.data.id) {
+          data.id = this.zoneDialog.data.id
+          this.updateZone(data)
+        } else {
+          this.createZone(data)
+        }
+      },
+      updateZone: function (data) {
+        console.log(data)
+        var self = this
+        LNbits.api
+          .request(
+            'POST',
+            '/diagonalley/api/v1/zones/' + data.id,
+            self.g.user.wallets[0].adminkey,
+            data
+          )
+          .then(function (response) {
+            console.log(response)
+            self.zones = _.reject(self.zones, function (obj) {
+              return obj.id == data.id
+            })
+            self.zones.push(mapZone(response.data))
+            self.zoneDialog.show = false
+            self.zoneDialog.data = {}
+            data = {}
           })
-          self.zones.push(mapZone(response.data))
-          self.zoneDialog.show = false
-          self.zoneDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createZone: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/zones',
-          self.g.user.wallets[0].inkey,
-          data
-        )
-        .then(function (response) {
-          self.zones.push(mapZone(response.data))
-          self.zoneDialog.show = false
-          self.zoneDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteZone: function (zoneId) {
-      var self = this
-      var zone = _.findWhere(self.zones, {id: zoneId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Zone link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/zones/' + zoneId,
-              self.g.user.wallets[0].adminkey
-            )
-            .then(function (response) {
-              self.zones = _.reject(self.zones, function (obj) {
-                return obj.id == zoneId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportZonesCSV: function () {
-      LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
-    },
-    ////////////////////////////////////////
-    //////////////////MARKET//////////////////
-    ////////////////////////////////////////
-    getMarkets(){
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/markets',
-          this.g.user.wallets[0].inkey
-        )
-        .then((response) => {
-          if (response.data) {
-            this.shops = response.data.map(mapShops)
-          }
-        })
-        .catch((error) => {
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
-    },
-    openShopUpdateDialog: function (linkId) {
-      var self = this
-      var link = _.findWhere(self.shops, {id: linkId})
-
-      this.shopDialog.data = _.clone(link._data)
-      this.shopDialog.show = true
-    },
-    sendShopFormData: function () {
-      let data = {...this.marketDialog.data}
-
-      if(!data.usr) {
-        data.usr = this.g.user.id
-      }
-      
-      if (data.id) {
-        this.updateZone(data)
-      } else {
-        this.createZone(data)
-      }
-    },
-    updateShop: function (data) {
-      var self = this
-      LNbits.api
-        .request(
-          'PUT',
-          '/diagonalley/api/v1/shops' + data.id,
-          _.findWhere(self.g.user.wallets, {
-            id: self.shopDialog.data.wallet
-          }).inkey,
-          _.pick(data, 'countries', 'cost')
-        )
-        .then(function (response) {
-          self.shops = _.reject(self.shops, function (obj) {
-            return obj.id == data.id
+      },
+      createZone: function (data) {
+        var self = this
+        LNbits.api
+          .request(
+            'POST',
+            '/diagonalley/api/v1/zones',
+            self.g.user.wallets[0].inkey,
+            data
+          )
+          .then(function (response) {
+            self.zones.push(mapZone(response.data))
+            self.zoneDialog.show = false
+            self.zoneDialog.data = {}
+            data = {}
           })
-          self.shops.push(mapShops(response.data))
-          self.shopDialog.show = false
-          self.shopDialog.data = {}
-          data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    createShop(data) {
-      console.log('data')
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/markets',
-          this.g.user.wallets[0].inkey,
-          data
-        )
-        .then((response) => {
-          this.shops.push(mapShops(response.data))
-          this.shopDialog.show = false
-          this.shopDialog.data = {}
-          data = {}
-        })
-        .catch((error) => {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteShop: function (shopId) {
-      var self = this
-      var shop = _.findWhere(self.shops, {id: shopId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this Shop link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/shops/' + shopId,
-              _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
-            )
-            .then(function (response) {
-              self.shops = _.reject(self.shops, function (obj) {
-                return obj.id == shopId
-              })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    exportShopsCSV: function () {
-      LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
-    },
-    ////////////////////////////////////////
-    ////////////////ORDERS//////////////////
-    ////////////////////////////////////////
-    getOrders: function () {
-      var self = this
-
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/orders?all_wallets=true',
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          if (response.data) {
-            self.orders = response.data.map(mapOrders)
-          }
-        })
-        .catch(function (error) {
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
-    },
-    createOrder: function () {
-      var data = {
-        address: this.orderDialog.data.address,
-        email: this.orderDialog.data.email,
-        quantity: this.orderDialog.data.quantity,
-        shippingzone: this.orderDialog.data.shippingzone
-      }
-      var self = this
+      },
+      deleteZone: function (zoneId) {
+        var self = this
+        var zone = _.findWhere(self.zones, {id: zoneId})
 
-      LNbits.api
-        .request(
-          'POST',
-          '/diagonalley/api/v1/orders',
-          _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
-            .inkey,
-          data
-        )
-        .then(function (response) {
-          self.orders.push(mapOrders(response.data))
-          self.orderDialog.show = false
-          self.orderDialog.data = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
-    deleteOrder: function (orderId) {
-      var self = this
-      var order = _.findWhere(self.orders, {id: orderId})
-
-      LNbits.utils
-        .confirmDialog('Are you sure you want to delete this order link?')
-        .onOk(function () {
-          LNbits.api
-            .request(
-              'DELETE',
-              '/diagonalley/api/v1/orders/' + orderId,
-              _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
-            )
-            .then(function (response) {
-              self.orders = _.reject(self.orders, function (obj) {
-                return obj.id == orderId
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this Zone link?')
+          .onOk(function () {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/diagonalley/api/v1/zones/' + zoneId,
+                self.g.user.wallets[0].adminkey
+              )
+              .then(function (response) {
+                self.zones = _.reject(self.zones, function (obj) {
+                  return obj.id == zoneId
+                })
               })
-            })
-            .catch(function (error) {
-              LNbits.utils.notifyApiError(error)
-            })
-        })
-    },
-    shipOrder: function (order_id) {
-      var self = this
+              .catch(function (error) {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      exportZonesCSV: function () {
+        LNbits.utils.exportCSV(this.zonesTable.columns, this.zones)
+      },
+      ////////////////////////////////////////
+      //////////////////MARKET//////////////////
+      ////////////////////////////////////////
+      getMarkets() {
+        LNbits.api
+          .request(
+            'GET',
+            '/diagonalley/api/v1/markets',
+            this.g.user.wallets[0].inkey
+          )
+          .then(response => {
+            if (response.data) {
+              this.shops = response.data.map(mapShops)
+            }
+          })
+          .catch(error => {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      openShopUpdateDialog: function (linkId) {
+        var self = this
+        var link = _.findWhere(self.shops, {id: linkId})
 
-      LNbits.api
-        .request(
-          'GET',
-          '/diagonalley/api/v1/orders/shipped/' + order_id,
-          this.g.user.wallets[0].inkey
-        )
-        .then(function (response) {
-          self.orders.push(mapOrders(response.data))
-        })
+        this.shopDialog.data = _.clone(link._data)
+        this.shopDialog.show = true
+      },
+      sendShopFormData: function () {
+        let data = {...this.marketDialog.data}
+
+        if (!data.usr) {
+          data.usr = this.g.user.id
+        }
+
+        if (data.id) {
+          this.updateZone(data)
+        } else {
+          this.createZone(data)
+        }
+      },
+      updateShop: function (data) {
+        var self = this
+        LNbits.api
+          .request(
+            'PUT',
+            '/diagonalley/api/v1/shops' + data.id,
+            _.findWhere(self.g.user.wallets, {
+              id: self.shopDialog.data.wallet
+            }).inkey,
+            _.pick(data, 'countries', 'cost')
+          )
+          .then(function (response) {
+            self.shops = _.reject(self.shops, function (obj) {
+              return obj.id == data.id
+            })
+            self.shops.push(mapShops(response.data))
+            self.shopDialog.show = false
+            self.shopDialog.data = {}
+            data = {}
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      createShop(data) {
+        console.log('data')
+        LNbits.api
+          .request(
+            'POST',
+            '/diagonalley/api/v1/markets',
+            this.g.user.wallets[0].inkey,
+            data
+          )
+          .then(response => {
+            this.shops.push(mapShops(response.data))
+            this.shopDialog.show = false
+            this.shopDialog.data = {}
+            data = {}
+          })
+          .catch(error => {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      deleteShop: function (shopId) {
+        var self = this
+        var shop = _.findWhere(self.shops, {id: shopId})
+
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this Shop link?')
+          .onOk(function () {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/diagonalley/api/v1/shops/' + shopId,
+                _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
+              )
+              .then(function (response) {
+                self.shops = _.reject(self.shops, function (obj) {
+                  return obj.id == shopId
+                })
+              })
+              .catch(function (error) {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      exportShopsCSV: function () {
+        LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
+      },
+      ////////////////////////////////////////
+      ////////////////ORDERS//////////////////
+      ////////////////////////////////////////
+      getOrders: function () {
+        var self = this
+
+        LNbits.api
+          .request(
+            'GET',
+            '/diagonalley/api/v1/orders?all_wallets=true',
+            this.g.user.wallets[0].inkey
+          )
+          .then(function (response) {
+            if (response.data) {
+              self.orders = response.data.map(mapOrders)
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      createOrder: function () {
+        var data = {
+          address: this.orderDialog.data.address,
+          email: this.orderDialog.data.email,
+          quantity: this.orderDialog.data.quantity,
+          shippingzone: this.orderDialog.data.shippingzone
+        }
+        var self = this
+
+        LNbits.api
+          .request(
+            'POST',
+            '/diagonalley/api/v1/orders',
+            _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
+              .inkey,
+            data
+          )
+          .then(function (response) {
+            self.orders.push(mapOrders(response.data))
+            self.orderDialog.show = false
+            self.orderDialog.data = {}
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      deleteOrder: function (orderId) {
+        var self = this
+        var order = _.findWhere(self.orders, {id: orderId})
+
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this order link?')
+          .onOk(function () {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/diagonalley/api/v1/orders/' + orderId,
+                _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
+              )
+              .then(function (response) {
+                self.orders = _.reject(self.orders, function (obj) {
+                  return obj.id == orderId
+                })
+              })
+              .catch(function (error) {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      shipOrder: function (order_id) {
+        var self = this
+
+        LNbits.api
+          .request(
+            'GET',
+            '/diagonalley/api/v1/orders/shipped/' + order_id,
+            this.g.user.wallets[0].inkey
+          )
+          .then(function (response) {
+            self.orders.push(mapOrders(response.data))
+          })
+      },
+      exportOrdersCSV: function () {
+        LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
+      }
     },
-    exportOrdersCSV: function () {
-      LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
+    created: function () {
+      if (this.g.user.wallets.length) {
+        this.getStalls()
+        this.getProducts()
+        this.getZones()
+        this.getOrders()
+        this.getMarkets()
+        this.customerKeys = [
+          'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
+          'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
+        ]
+        console.log(_.pick(this.g.user, 'id'))
+      }
     }
-  },
-  created: function () {
-    if (this.g.user.wallets.length) {
-      this.getStalls()
-      this.getProducts()
-      this.getZones()
-      this.getOrders()
-      this.getMarkets()
-      this.customerKeys = [
-        'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
-        'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
-      ]
-      console.log(_.pick(this.g.user, "id")) 
-    }
-  }
-})
+  })
 </script>
 {% endblock %}
-
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 08c30428..30dbebe7 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -34,16 +34,17 @@ async def display(request: Request, stall_id):
 
     stall = stall.dict()
     del stall["privatekey"]
-    
+
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
         {
             "request": request,
             "stall": stall,
-            "products": [product.dict() for product in products]
+            "products": [product.dict() for product in products],
         },
     )
 
+
 # @diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
 # async def display(request: Request, stall_id):
 #     stalls = await get_diagonalley_stall(stall_id)
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index b2fb5a47..cedd1d42 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -5,6 +5,8 @@ from uuid import uuid4
 from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
+from starlette.exceptions import HTTPException
+
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
 from lnbits.decorators import (
@@ -13,7 +15,6 @@ from lnbits.decorators import (
     require_admin_key,
     require_invoice_key,
 )
-from starlette.exceptions import HTTPException
 
 from . import db, diagonalley_ext
 from .crud import (
@@ -94,22 +95,22 @@ async def api_diagonalley_products(
 @diagonalley_ext.post("/api/v1/products")
 @diagonalley_ext.put("/api/v1/products/{product_id}")
 async def api_diagonalley_product_create(
-    data: createProduct, product_id = None, wallet: WalletTypeInfo = Depends(get_key_type)
+    data: createProduct, product_id=None, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
 
     if product_id:
-        product = await get_diagonalley_product(product_id)        
+        product = await get_diagonalley_product(product_id)
         if not product:
             return {"message": "Withdraw product does not exist."}
-        
-        stall = await get_diagonalley_stall(stall_id = product.stall)
+
+        stall = await get_diagonalley_stall(stall_id=product.stall)
         if stall.wallet != wallet.wallet.id:
             return {"message": "Not your withdraw product."}
 
         product = await update_diagonalley_product(product_id, **data.dict())
     else:
         product = await create_diagonalley_product(data=data)
-    
+
     return product.dict()
 
 
@@ -392,15 +393,18 @@ async def api_diagonalley_stall_order(
 # MARKETS
 ##
 
+
 @diagonalley_ext.get("/api/v1/markets")
-async def api_diagonalley_orders(
-    wallet: WalletTypeInfo = Depends(get_key_type)
-):
+async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type)):
     try:
-        return [market.dict() for market in await get_diagonalley_markets(wallet.wallet.user)]
+        return [
+            market.dict()
+            for market in await get_diagonalley_markets(wallet.wallet.user)
+        ]
     except:
         return {"message": "We could not retrieve the markets."}
 
+
 @diagonalley_ext.post("/api/v1/markets")
 @diagonalley_ext.put("/api/v1/markets/{market_id}")
 async def api_diagonalley_stall_create(

From 4cd86d0dafb8b989ccdd601f9891a14e1991a433 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 18 Aug 2022 10:49:04 +0100
Subject: [PATCH 078/174] create order

---
 lnbits/extensions/diagonalley/crud.py         | 30 ++++----
 lnbits/extensions/diagonalley/migrations.py   | 20 ++---
 lnbits/extensions/diagonalley/models.py       |  8 +-
 .../templates/diagonalley/stall.html          | 75 ++++++++++++++-----
 lnbits/extensions/diagonalley/views.py        | 16 +++-
 lnbits/extensions/diagonalley/views_api.py    | 25 ++++++-
 6 files changed, 124 insertions(+), 50 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 8016fd07..798705bf 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -210,30 +210,34 @@ async def delete_diagonalley_stall(stall_id: str) -> None:
 ###Orders
 
 
-async def create_diagonalley_order(wallet_id: str, data: createOrder) -> Orders:
+async def create_diagonalley_order(data: createOrder, invoiceid: str) -> Orders:
+    returning = "" if db.type == SQLITE else "RETURNING ID"
+    method = db.execute if db.type == SQLITE else db.fetchone
 
-    order_id = urlsafe_short_hash()
-    await db.execute(
+    result = await (method)(
         f"""
-            INSERT INTO diagonalley.orders (id, wallet, shippingzone, address, email, total, invoiceid, paid, shipped)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+            INSERT INTO diagonalley.orders (wallet, shippingzone, address, email, total, invoiceid, paid, shipped)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+            {returning}
             """,
         (
-            order_id,
-            wallet_id,
+            data.wallet,
             data.shippingzone,
             data.address,
             data.email,
             data.total,
-            data.invoiceid,
+            invoiceid,
             False,
             False,
         ),
     )
-
-    link = await get_diagonalley_order(order_id)
-    assert link, "Newly created link couldn't be retrieved"
-    return link
+    if db.type == SQLITE:
+        return result._result_proxy.lastrowid
+    else:
+        return result[0]
+    # link = await get_diagonalley_order(link.id)
+    # assert link, "Newly created link couldn't be retrieved"
+    # return link
 
 
 async def create_diagonalley_order_details(
@@ -243,7 +247,7 @@ async def create_diagonalley_order_details(
         item_id = urlsafe_short_hash()
         await db.execute(
             """
-            INSERT INTO diagonalley.order_details (id, orderid, productid, quantity)
+            INSERT INTO diagonalley.order_details (id, order_id, product_id, quantity)
             VALUES (?, ?, ?, ?)
             """,
             (
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index a7380b65..6e1510a7 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -11,7 +11,8 @@ async def m001_initial(db):
             publickey TEXT,
             privatekey TEXT,
             relays TEXT,
-            shippingzones TEXT NOT NULL
+            shippingzones TEXT NOT NULL,
+            rating INTEGER DEFAULT 0
         );
     """
     )
@@ -20,7 +21,7 @@ async def m001_initial(db):
     Initial products table.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE diagonalley.products (
             id TEXT PRIMARY KEY,
             stall TEXT NOT NULL REFERENCES {db.references_schema}stalls (id),
@@ -30,7 +31,7 @@ async def m001_initial(db):
             image TEXT,
             price INTEGER NOT NULL,
             quantity INTEGER NOT NULL,
-            rating INTEGER NOT NULL
+            rating INTEGER DEFAULT 0
         );
     """
     )
@@ -53,12 +54,13 @@ async def m001_initial(db):
     Initial orders table.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE diagonalley.orders (
             id {db.serial_primary_key},
             wallet TEXT NOT NULL,
+            username TEXT,
             pubkey TEXT,
-            shippingzone INTEGER NOT NULL,
+            shippingzone TEXT NOT NULL,
             address TEXT NOT NULL,
             email TEXT NOT NULL,
             total INTEGER NOT NULL,
@@ -76,11 +78,11 @@ async def m001_initial(db):
     Initial order details table.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE diagonalley.order_details (
             id TEXT PRIMARY KEY,
-            orderid INTEGER NOT NULL REFERENCES {db.references_schema}orders (id)
-            productid TEXT NOT NULL REFERENCES {db.references_schema}products (id),
+            order_id INTEGER NOT NULL REFERENCES {db.references_schema}orders (id),
+            product_id TEXT NOT NULL REFERENCES {db.references_schema}products (id),
             quantity INTEGER NOT NULL
         );
     """
@@ -103,7 +105,7 @@ async def m001_initial(db):
     Initial market stalls table.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE diagonalley.market_stalls (
             id TEXT PRIMARY KEY,
             marketid TEXT NOT NULL REFERENCES {db.references_schema}markets (id),
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index f07e9c80..82115be9 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -71,15 +71,11 @@ class createOrderDetails(BaseModel):
 class createOrder(BaseModel):
     wallet: str = Query(...)
     pubkey: str = Query(None)
-    shippingzone: int = Query(...)
+    shippingzone: str = Query(...)
     address: str = Query(...)
     email: str = Query(...)
     total: int = Query(...)
-    invoiceid: str = Query(...)
     products: List[createOrderDetails]
-    # stall: str = Query(...)
-    # product: str = Query(...)
-    # quantity: int = Query(..., ge=1)
 
 
 class Orders(BaseModel):
@@ -89,7 +85,7 @@ class Orders(BaseModel):
     pubkey: str
     product: str
     quantity: int
-    shippingzone: int
+    shippingzone: str
     address: str
     email: str
     invoiceid: str
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 5638bc3d..28f6ad22 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -80,7 +80,7 @@
         alt="Product Image"
         loading="lazy"
         spinner-color="white"
-        fit="cover"
+        fit="contain"
         height="300px"
       ></q-img>
 
@@ -166,15 +166,15 @@
         <q-input
           filled
           dense
-          v-model.trim="checkoutDialog.data.address_1"
-          label="Address (line 1)"
+          v-model.trim="checkoutDialog.data.address"
+          label="Address"
         ></q-input>
-        <q-input
+        <!-- <q-input
           filled
           dense
           v-model.trim="checkoutDialog.data.address_2"
           label="Address (line 2)"
-        ></q-input>
+        ></q-input> -->
         <q-input
           v-model="checkoutDialog.data.email"
           filled
@@ -182,16 +182,28 @@
           type="email"
           label="Email"
         ></q-input>
+        <p>Select the shipping zone:</p>
+        <div class="row q-mt-lg">
+          <q-option-group
+            :options="stall.zones"
+            type="radio"
+            emit-value
+            v-model="checkoutDialog.data.shippingzone"
+          />
+        </div>
+        <div class="row q-mt-lg">
+          {% raw %} Total: {{ finalCost }} {% endraw %}
+        </div>
         <div class="row q-mt-lg">
           <q-btn
             unelevated
             color="primary"
-            :disable="checkoutDialog.data.address_1 == null
-              || checkoutDialog.data.email == null"
+            :disable="checkoutDialog.data.address == null
+              || checkoutDialog.data.email == null
+              || checkoutDialog.data.shippingzone == null"
             type="submit"
             >Checkout</q-btn
           >
-
           <q-btn
             v-close-popup
             flat
@@ -238,9 +250,25 @@
             p.categories.includes(this.searchText)
           )
         })
+      },
+      finalCost() {
+        if (!this.checkoutDialog.data.shippingzone) return this.cart.total
+
+        let zoneCost = this.stall.zones.find(
+          z => z.value == this.checkoutDialog.data.shippingzone
+        )
+
+        return this.cart.total + zoneCost.cost
       }
     },
     methods: {
+      resetCart() {
+        this.cart = {
+          total: 0,
+          size: 0,
+          products: new Map()
+        }
+      },
       addToCart(item) {
         let prod = this.cart.products
         if (prod.has(item.id)) {
@@ -266,17 +294,28 @@
         this.cartMenu = Array.from(this.cart.products, item => {
           return {id: item[0], ...item[1]}
         })
-        console.log(this.cartMenu)
+        console.log(this.cartMenu, this.cart)
       },
       placeOrder() {
-        // productid: str = Query(...)
-        // stall: str = Query(...)
-        // product: str = Query(...)
-        // quantity: int = Query(..., ge=1)
-        // shippingzone: int = Query(...)
-        // address: str = Query(...)
-        // email: str = Query(...)
-        // invoiceid: str = Query(...)
+        let dialog = this.checkoutDialog.data
+        let data = {
+          ...this.checkoutDialog.data,
+          wallet: this.stall.wallet,
+          total: this.finalCost,
+          products: Array.from(this.cart.products, p => {
+            return {product_id: p[0], quantity: p[1].quantity}
+          })
+        }
+
+        LNbits.api
+          .request('POST', '/diagonalley/api/v1/orders', null, data)
+          .then(res => {
+            this.checkoutDialog = {show: false, data: {}}
+            this.resetCart()
+            console.log(res.data)
+          })
+          .catch(error => LNbits.utils.notifyApiError(error))
+
         return
       }
     },
@@ -287,7 +326,7 @@
       //let stall_ids = new Set()
       //this.products.map(p => stall_ids.add(p.stall))
 
-      console.log(this.stall)
+      console.log(this.stall, this.products)
     }
   })
 </script>
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 30dbebe7..f4446482 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -3,6 +3,7 @@ from http import HTTPStatus
 from fastapi import Request
 from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
+from loguru import logger
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
 
@@ -10,7 +11,12 @@ from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
 
-from .crud import get_diagonalley_products, get_diagonalley_stall
+from .crud import (
+    get_diagonalley_products,
+    get_diagonalley_stall,
+    get_diagonalley_zone,
+    get_diagonalley_zones,
+)
 
 templates = Jinja2Templates(directory="templates")
 
@@ -26,6 +32,13 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 async def display(request: Request, stall_id):
     stall = await get_diagonalley_stall(stall_id)
     products = await get_diagonalley_products(stall_id)
+    zones = []
+    for id in stall.shippingzones.split(","):
+        z = await get_diagonalley_zone(id)
+        z = z.dict()
+        zones.append({"label": z["countries"], "cost": z["cost"], "value": z["id"]})
+    
+    logger.debug(f"ZONES {zones}")
 
     if not stall:
         raise HTTPException(
@@ -34,6 +47,7 @@ async def display(request: Request, stall_id):
 
     stall = stall.dict()
     del stall["privatekey"]
+    stall["zones"] = zones
 
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/stall.html",
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index cedd1d42..fd474f4a 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -5,6 +5,7 @@ from uuid import uuid4
 from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
+from loguru import logger
 from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
@@ -16,9 +17,11 @@ from lnbits.decorators import (
     require_invoice_key,
 )
 
+from ...helpers import urlsafe_short_hash
 from . import db, diagonalley_ext
 from .crud import (
     create_diagonalley_order,
+    create_diagonalley_order_details,
     create_diagonalley_product,
     create_diagonalley_stall,
     create_diagonalley_zone,
@@ -254,10 +257,26 @@ async def api_diagonalley_orders(
 
 @diagonalley_ext.post("/api/v1/orders")
 async def api_diagonalley_order_create(
-    data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
+    data: createOrder
 ):
-    order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
-    return order.dict()
+    ref = urlsafe_short_hash()
+        
+    payment_hash, payment_request = await create_invoice(
+        wallet_id=data.wallet,
+        amount=data.total,
+        memo=f"New order on Diagon alley",
+        extra={
+            "tag": "diagonalley",
+            "reference": ref,
+        }
+    )
+    order_id = await create_diagonalley_order(invoiceid=payment_hash, data=data)
+    logger.debug(f"ORDER ID {order_id}")
+    logger.debug(f"PRODUCTS {data.products}")
+    await create_diagonalley_order_details(order_id=order_id, data=data.products)
+    return {"payment_hash": payment_hash, "payment_request": payment_request, "order_reference": ref}
+    # order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
+    # return order.dict()
 
 
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")

From d6fe562067e7b827531d1a824b19d7fcf97a71e1 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 18 Aug 2022 16:18:07 +0100
Subject: [PATCH 079/174] have orders show on user page and invoice init

---
 lnbits/extensions/diagonalley/models.py       |  9 +-
 .../templates/diagonalley/index.html          | 99 +++++++++++++++----
 .../templates/diagonalley/stall.html          | 85 +++++++++++++++-
 lnbits/extensions/diagonalley/views.py        |  3 +
 lnbits/extensions/diagonalley/views_api.py    | 29 ++----
 5 files changed, 178 insertions(+), 47 deletions(-)

diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 82115be9..e6516037 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -80,14 +80,13 @@ class createOrder(BaseModel):
 
 class Orders(BaseModel):
     id: str
-    productid: str
-    stall: str
-    pubkey: str
-    product: str
-    quantity: int
+    wallet: str
+    username: Optional[str]
+    pubkey: Optional[str]
     shippingzone: str
     address: str
     email: str
+    total: int
     invoiceid: str
     paid: bool
     shipped: bool
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 5482cd3f..516544ea 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -401,6 +401,7 @@
           {% raw %}
           <template v-slot:header="props">
             <q-tr :props="props">
+              <q-th auto-width></q-th>
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 {{ col.label }}
               </q-th>
@@ -409,6 +410,16 @@
           </template>
           <template v-slot:body="props">
             <q-tr :props="props">
+              <q-td auto-width>
+                <q-btn
+                  size="sm"
+                  color="accent"
+                  round
+                  dense
+                  @click="props.expand = !props.expand"
+                  :icon="props.expand ? 'remove' : 'add'"
+                />
+              </q-td>
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 {{ col.value }}
               </q-td>
@@ -436,6 +447,61 @@
                 ></q-btn>
               </q-td>
             </q-tr>
+            <q-tr v-show="props.expand" :props="props">
+              <q-td colspan="100%">
+                <template>
+                  <div class="q-pa-md">
+                    <q-list>
+                      <q-item-label header>Order Details</q-item-label>
+
+                      <q-item v-for="col in props.row.details" :key="col.id">
+                        <q-item-section>
+                          <q-item-label>Products</q-item-label>
+                          <q-item-label caption
+                            >{{ products.length && (_.findWhere(products, {id:
+                            col.product_id})).product }}</q-item-label
+                          >
+                          <q-item-label caption
+                            >Quantity: {{ col.quantity }}</q-item-label
+                          >
+                        </q-item-section>
+                      </q-item>
+
+                      <q-item>
+                        <q-item-section>
+                          <q-item-label>Shipping to</q-item-label>
+                          <q-item-label caption
+                            >{{ props.row.address }}</q-item-label
+                          >
+                        </q-item-section>
+                      </q-item>
+
+                      <q-item>
+                        <q-item-section>
+                          <q-item-label>User info</q-item-label>
+                          <q-item-label caption v-if="props.row.username"
+                            >{{ props.row.username }}</q-item-label
+                          >
+                          <q-item-label caption
+                            >{{ props.row.email }}</q-item-label
+                          >
+                          <q-item-label caption v-if="props.row.pubkey"
+                            >{{ props.row.pubkey }}</q-item-label
+                          >
+                        </q-item-section>
+                      </q-item>
+                      <q-item>
+                        <q-item-section>
+                          <q-item-label>Total</q-item-label>
+                          <q-item-label>{{ props.row.total }}</q-item-label>
+                          <!-- <q-icon name="star" color="yellow" /> -->
+                        </q-item-section>
+                      </q-item>
+                    </q-list>
+                  </div>
+                </template>
+              </q-td>
+            </q-tr>
           </template>
           {% endraw %}
         </q-table>
@@ -724,7 +790,6 @@
   }
   const mapProducts = obj => {
     obj._data = _.clone(obj)
-    console.log(obj)
     return obj
   }
   const mapZone = obj => {
@@ -733,6 +798,10 @@
   }
   const mapOrders = obj => {
     obj._data = _.clone(obj)
+    obj.time = Quasar.utils.date.formatDate(
+      new Date(obj.time * 1000),
+      'YYYY-MM-DD HH:mm'
+    )
     return obj
   }
   const mapKeys = obj => {
@@ -822,7 +891,7 @@
         label: '',
         ordersTable: {
           columns: [
-            {
+            /*{
               name: 'product',
               align: 'left',
               label: 'Product',
@@ -833,12 +902,18 @@
               align: 'left',
               label: 'Quantity',
               field: 'quantity'
+            },*/
+            {
+              name: 'id',
+              align: 'left',
+              label: 'ID',
+              field: 'id'
             },
             {
-              name: 'address',
+              name: 'time',
               align: 'left',
-              label: 'Address',
-              field: 'address'
+              label: 'Date',
+              field: 'time'
             },
             {
               name: 'invoiceid',
@@ -1037,7 +1112,6 @@
       ////////////////STALLS//////////////////
       ////////////////////////////////////////
       getStalls: function () {
-        console.log(this.g.user)
         var self = this
         LNbits.api
           .request(
@@ -1048,7 +1122,6 @@
           .then(function (response) {
             if (response.data) {
               self.stalls = response.data.map(mapStalls)
-              console.log(self.stalls)
             }
           })
           .catch(function (error) {
@@ -1072,7 +1145,6 @@
 
         this.stallDialog.data.shippingzones = shippingzones //this.stallDialog.data.shippingzones.split(",")
 
-        console.log(this.stallDialog.data)
         //let zones = this.zoneOptions
         //  .filter(z => z.id == )
         this.stallDialog.show = true
@@ -1096,7 +1168,6 @@
         }
       },
       updateStall: function (data) {
-        console.log(data)
         var self = this
         LNbits.api
           .request(
@@ -1179,7 +1250,6 @@
             self.g.user.wallets[0].inkey
           )
           .then(function (response) {
-            console.log('RESP DATA', response.data)
             if (response.data) {
               self.products = response.data.map(mapProducts)
             }
@@ -1271,7 +1341,6 @@
         let self = this
         const walletId = _.findWhere(this.stalls, {id: data.stall}).wallet
 
-        console.log('DATA', walletId, data)
         LNbits.api
           .request(
             'POST',
@@ -1280,7 +1349,6 @@
             data
           )
           .then(response => {
-            console.log(response)
             self.products.push(mapProducts(response.data))
             self.resetDialog('productDialog')
           })
@@ -1328,7 +1396,6 @@
           )
           .then(function (response) {
             if (response.data) {
-              console.log(response)
               self.zones = response.data.map(mapZone)
             }
           })
@@ -1360,7 +1427,6 @@
         }
       },
       updateZone: function (data) {
-        console.log(data)
         var self = this
         LNbits.api
           .request(
@@ -1370,7 +1436,6 @@
             data
           )
           .then(function (response) {
-            console.log(response)
             self.zones = _.reject(self.zones, function (obj) {
               return obj.id == data.id
             })
@@ -1492,7 +1557,6 @@
           })
       },
       createShop(data) {
-        console.log('data')
         LNbits.api
           .request(
             'POST',
@@ -1551,6 +1615,7 @@
           .then(function (response) {
             if (response.data) {
               self.orders = response.data.map(mapOrders)
+              console.log(self.orders)
             }
           })
           .catch(function (error) {
@@ -1629,7 +1694,7 @@
         this.getProducts()
         this.getZones()
         this.getOrders()
-        this.getMarkets()
+        //this.getMarkets() # NOT YET IMPLEMENTED
         this.customerKeys = [
           'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
           'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 28f6ad22..b33feb2a 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -216,6 +216,31 @@
       </q-form>
     </q-card>
   </q-dialog>
+  <!-- INVOICE DIALOG -->
+  <q-dialog
+    v-model="qrCodeDialog.show"
+    position="top"
+    @hide="qrCodeDialog.show = false"
+  >
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card text-center">
+      <a :href="'lightning:' + qrCodeDialog.data.payment_request">
+        <q-responsive :ratio="1" class="q-mx-xs">
+          <qrcode
+            :value="qrCodeDialog.data.payment_request"
+            :options="{width: 400}"
+            class="rounded-borders"
+          ></qrcode>
+        </q-responsive>
+      </a>
+      <br />
+      <q-btn
+        outline
+        color="grey"
+        @click="copyText('lightning:' + qrCodeDialog.data.payment_request, 'Invoice copied to clipboard!')"
+        >Copy Invoice</q-btn
+      >
+    </q-card>
+  </q-dialog>
 </div>
 {% endblock %} {% block scripts %}
 <script>
@@ -227,6 +252,9 @@
       return {
         stall: null,
         products: [],
+        wallet: {
+          inkey: null
+        },
         searchText: null,
         cart: {
           total: 0,
@@ -237,7 +265,14 @@
         checkoutDialog: {
           show: false,
           data: {}
-        }
+        },
+        qrCodeDialog: {
+          data: {
+            payment_request: null
+          },
+          show: false
+        },
+        cancelListener: () => {}
       }
     },
     computed: {
@@ -308,21 +343,61 @@
         }
 
         LNbits.api
-          .request('POST', '/diagonalley/api/v1/orders', null, data)
+          .request(
+            'POST',
+            '/diagonalley/api/v1/orders',
+            this.wallet.inkey,
+            data
+          )
           .then(res => {
-            this.checkoutDialog = {show: false, data: {}}
-            this.resetCart()
-            console.log(res.data)
+            this.checkoutDialog = {show: false}
+
+            return res.data
+          })
+          .then(data => {
+            this.qrCodeDialog.data = data
+            this.qrCodeDialog.show = true
+
+            qrCodeDialog.dismissMsg = this.$q.notify({
+              timeout: 0,
+              message: 'Waiting for payment...'
+            })
           })
           .catch(error => LNbits.utils.notifyApiError(error))
 
         return
+      },
+      startPaymentNotifier() {
+        this.cancelListener()
+
+        this.cancelListener = LNbits.events.onInvoicePaid(
+          this.wallet,
+          payment => {
+            this.qrCodeDialog = {
+              show: false,
+              data: {
+                payment_request: null
+              }
+            }
+
+            this.checkoutDialog = {data: {}}
+            this.resetCart()
+
+            this.$q.notify({
+              type: 'positive',
+              message: 'Sent, thank you!',
+              icon: 'thumb_up'
+            })
+          }
+        )
       }
     },
     created() {
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = JSON.parse('{{ products | tojson }}')
+      this.wallet.inkey = '{{ inkey }}'
 
+      this.startPaymentNotifier()
       //let stall_ids = new Set()
       //this.products.map(p => stall_ids.add(p.stall))
 
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index f4446482..747b6d55 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -11,6 +11,7 @@ from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
 
+from ...core.crud import get_wallet
 from .crud import (
     get_diagonalley_products,
     get_diagonalley_stall,
@@ -32,6 +33,7 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 async def display(request: Request, stall_id):
     stall = await get_diagonalley_stall(stall_id)
     products = await get_diagonalley_products(stall_id)
+    wallet = await get_wallet(stall.wallet)
     zones = []
     for id in stall.shippingzones.split(","):
         z = await get_diagonalley_zone(id)
@@ -55,6 +57,7 @@ async def display(request: Request, stall_id):
             "request": request,
             "stall": stall,
             "products": [product.dict() for product in products],
+            "inkey": wallet.inkey
         },
     )
 
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index fd474f4a..724b761b 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -32,6 +32,7 @@ from .crud import (
     get_diagonalley_market,
     get_diagonalley_markets,
     get_diagonalley_order,
+    get_diagonalley_order_details,
     get_diagonalley_orders,
     get_diagonalley_product,
     get_diagonalley_products,
@@ -59,24 +60,6 @@ from .models import (
 
 
 ### Products
-"""
-@copilot_ext.get("/api/v1/copilot/{copilot_id}")
-async def api_copilot_retrieve(
-    req: Request,
-    copilot_id: str = Query(None),
-    wallet: WalletTypeInfo = Depends(get_key_type),
-):
-    copilot = await get_copilot(copilot_id)
-    if not copilot:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Copilot not found"
-        )
-    if not copilot.lnurl_toggle:
-        return copilot.dict()
-    return {**copilot.dict(), **{"lnurl": copilot.lnurl(req)}}
-"""
-
-
 @diagonalley_ext.get("/api/v1/products")
 async def api_diagonalley_products(
     wallet: WalletTypeInfo = Depends(get_key_type),
@@ -245,12 +228,18 @@ async def api_diagonalley_orders(
     wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
 ):
     wallet_ids = [wallet.wallet.id]
-
     if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
+    orders = await get_diagonalley_orders(wallet_ids)
+    orders_with_details = []
+    for order in orders:
+        order = order.dict()
+        order["details"] = await get_diagonalley_order_details(order["id"])
+        orders_with_details.append(order)
     try:
-        return [order.dict() for order in await get_diagonalley_orders(wallet_ids)]
+        return orders_with_details#[order for order in orders]
+        # return [order.dict() for order in await get_diagonalley_orders(wallet_ids)]
     except:
         return {"message": "We could not retrieve the orders."}
 

From 2e9b8c1360fdfa632048407dc10de16bbc505466 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 18 Aug 2022 16:20:15 +0100
Subject: [PATCH 080/174] make format

---
 lnbits/extensions/diagonalley/views.py     |  4 ++--
 lnbits/extensions/diagonalley/views_api.py | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 747b6d55..c440d2ae 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -39,7 +39,7 @@ async def display(request: Request, stall_id):
         z = await get_diagonalley_zone(id)
         z = z.dict()
         zones.append({"label": z["countries"], "cost": z["cost"], "value": z["id"]})
-    
+
     logger.debug(f"ZONES {zones}")
 
     if not stall:
@@ -57,7 +57,7 @@ async def display(request: Request, stall_id):
             "request": request,
             "stall": stall,
             "products": [product.dict() for product in products],
-            "inkey": wallet.inkey
+            "inkey": wallet.inkey,
         },
     )
 
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 724b761b..5bdd3c2a 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -238,18 +238,16 @@ async def api_diagonalley_orders(
         order["details"] = await get_diagonalley_order_details(order["id"])
         orders_with_details.append(order)
     try:
-        return orders_with_details#[order for order in orders]
+        return orders_with_details  # [order for order in orders]
         # return [order.dict() for order in await get_diagonalley_orders(wallet_ids)]
     except:
         return {"message": "We could not retrieve the orders."}
 
 
 @diagonalley_ext.post("/api/v1/orders")
-async def api_diagonalley_order_create(
-    data: createOrder
-):
+async def api_diagonalley_order_create(data: createOrder):
     ref = urlsafe_short_hash()
-        
+
     payment_hash, payment_request = await create_invoice(
         wallet_id=data.wallet,
         amount=data.total,
@@ -257,13 +255,17 @@ async def api_diagonalley_order_create(
         extra={
             "tag": "diagonalley",
             "reference": ref,
-        }
+        },
     )
     order_id = await create_diagonalley_order(invoiceid=payment_hash, data=data)
     logger.debug(f"ORDER ID {order_id}")
     logger.debug(f"PRODUCTS {data.products}")
     await create_diagonalley_order_details(order_id=order_id, data=data.products)
-    return {"payment_hash": payment_hash, "payment_request": payment_request, "order_reference": ref}
+    return {
+        "payment_hash": payment_hash,
+        "payment_request": payment_request,
+        "order_reference": ref,
+    }
     # order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
     # return order.dict()
 

From e76c23b096e555ea125b2b0ec19155cc7b645dd8 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 18 Aug 2022 16:56:10 +0100
Subject: [PATCH 081/174] remove nostradmin from this branch

---
 coverage.xml                                  | 13560 ----------------
 lnbits/extensions/nostradmin/README.md        |     3 -
 lnbits/extensions/nostradmin/__init__.py      |    37 -
 lnbits/extensions/nostradmin/config.json      |     6 -
 lnbits/extensions/nostradmin/crud.py          |   146 -
 lnbits/extensions/nostradmin/migrations.py    |    74 -
 lnbits/extensions/nostradmin/models.py        |    52 -
 lnbits/extensions/nostradmin/relay_manager.py |   105 -
 .../templates/nostradmin/index.html           |   303 -
 lnbits/extensions/nostradmin/views.py         |   110 -
 lnbits/extensions/nostradmin/views_api.py     |    63 -
 11 files changed, 14459 deletions(-)
 delete mode 100644 coverage.xml
 delete mode 100644 lnbits/extensions/nostradmin/README.md
 delete mode 100644 lnbits/extensions/nostradmin/__init__.py
 delete mode 100644 lnbits/extensions/nostradmin/config.json
 delete mode 100644 lnbits/extensions/nostradmin/crud.py
 delete mode 100644 lnbits/extensions/nostradmin/migrations.py
 delete mode 100644 lnbits/extensions/nostradmin/models.py
 delete mode 100644 lnbits/extensions/nostradmin/relay_manager.py
 delete mode 100644 lnbits/extensions/nostradmin/templates/nostradmin/index.html
 delete mode 100644 lnbits/extensions/nostradmin/views.py
 delete mode 100644 lnbits/extensions/nostradmin/views_api.py

diff --git a/coverage.xml b/coverage.xml
deleted file mode 100644
index dd7ec7b1..00000000
--- a/coverage.xml
+++ /dev/null
@@ -1,13560 +0,0 @@
-<?xml version="1.0" ?>
-<coverage version="6.4.3" timestamp="1660296690320" lines-valid="12273" lines-covered="4905" line-rate="0.3997" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
-	<!-- Generated by coverage.py: https://coverage.readthedocs.io -->
-	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
-	<sources>
-		<source>/home/tvasconcelos/Work/lnbits/lnbits</source>
-	</sources>
-	<packages>
-		<package name="." line-rate="0.6764" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="__init__.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines/>
-				</class>
-				<class name="__main__.py" filename="__main__.py" complexity="0" line-rate="0" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="0"/>
-						<line number="3" hits="0"/>
-						<line number="4" hits="0"/>
-						<line number="5" hits="0"/>
-						<line number="7" hits="0"/>
-						<line number="8" hits="0"/>
-						<line number="19" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-					</lines>
-				</class>
-				<class name="app.py" filename="app.py" complexity="0" line-rate="0.7045" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="0"/>
-						<line number="84" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="119" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="1"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="1"/>
-						<line number="131" hits="1"/>
-						<line number="133" hits="1"/>
-						<line number="134" hits="1"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="1"/>
-						<line number="138" hits="1"/>
-						<line number="139" hits="1"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="147" hits="1"/>
-						<line number="150" hits="1"/>
-						<line number="151" hits="1"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="160" hits="1"/>
-						<line number="161" hits="1"/>
-						<line number="162" hits="1"/>
-						<line number="163" hits="0"/>
-						<line number="165" hits="1"/>
-						<line number="166" hits="1"/>
-						<line number="167" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="171" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="174" hits="1"/>
-						<line number="175" hits="1"/>
-						<line number="176" hits="0"/>
-						<line number="179" hits="1"/>
-						<line number="180" hits="1"/>
-						<line number="181" hits="1"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="186" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="193" hits="0"/>
-						<line number="199" hits="1"/>
-						<line number="200" hits="1"/>
-						<line number="201" hits="1"/>
-						<line number="202" hits="1"/>
-						<line number="203" hits="1"/>
-						<line number="205" hits="1"/>
-						<line number="206" hits="1"/>
-						<line number="209" hits="1"/>
-						<line number="210" hits="1"/>
-						<line number="211" hits="1"/>
-						<line number="212" hits="1"/>
-						<line number="213" hits="1"/>
-						<line number="214" hits="1"/>
-						<line number="216" hits="0"/>
-						<line number="218" hits="1"/>
-						<line number="219" hits="1"/>
-						<line number="220" hits="1"/>
-						<line number="221" hits="0"/>
-						<line number="222" hits="1"/>
-						<line number="225" hits="1"/>
-						<line number="226" hits="1"/>
-						<line number="227" hits="0"/>
-						<line number="228" hits="0"/>
-						<line number="229" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="231" hits="0"/>
-					</lines>
-				</class>
-				<class name="bolt11.py" filename="bolt11.py" complexity="0" line-rate="0.7857" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="114" hits="1"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="1"/>
-						<line number="128" hits="1"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="1"/>
-						<line number="131" hits="1"/>
-						<line number="132" hits="1"/>
-						<line number="134" hits="1"/>
-						<line number="136" hits="1"/>
-						<line number="137" hits="1"/>
-						<line number="138" hits="1"/>
-						<line number="139" hits="1"/>
-						<line number="140" hits="1"/>
-						<line number="141" hits="0"/>
-						<line number="143" hits="1"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="1"/>
-						<line number="146" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="162" hits="1"/>
-						<line number="165" hits="1"/>
-						<line number="166" hits="1"/>
-						<line number="167" hits="1"/>
-						<line number="169" hits="1"/>
-						<line number="170" hits="0"/>
-						<line number="174" hits="1"/>
-						<line number="176" hits="0"/>
-						<line number="178" hits="1"/>
-						<line number="181" hits="1"/>
-						<line number="184" hits="1"/>
-						<line number="185" hits="1"/>
-						<line number="187" hits="1"/>
-						<line number="192" hits="1"/>
-						<line number="193" hits="1"/>
-						<line number="194" hits="0"/>
-						<line number="196" hits="1"/>
-						<line number="197" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="199" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="207" hits="0"/>
-						<line number="208" hits="1"/>
-						<line number="209" hits="0"/>
-						<line number="210" hits="1"/>
-						<line number="211" hits="1"/>
-						<line number="212" hits="1"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="216" hits="0"/>
-						<line number="217" hits="0"/>
-						<line number="218" hits="1"/>
-						<line number="219" hits="1"/>
-						<line number="220" hits="0"/>
-						<line number="221" hits="0"/>
-						<line number="224" hits="0"/>
-						<line number="226" hits="1"/>
-						<line number="232" hits="1"/>
-						<line number="233" hits="0"/>
-						<line number="234" hits="1"/>
-						<line number="235" hits="0"/>
-						<line number="238" hits="1"/>
-						<line number="239" hits="1"/>
-						<line number="243" hits="1"/>
-						<line number="244" hits="1"/>
-						<line number="246" hits="1"/>
-						<line number="249" hits="1"/>
-						<line number="250" hits="1"/>
-						<line number="253" hits="1"/>
-						<line number="254" hits="1"/>
-						<line number="255" hits="1"/>
-						<line number="256" hits="1"/>
-						<line number="257" hits="1"/>
-						<line number="258" hits="1"/>
-						<line number="259" hits="1"/>
-						<line number="260" hits="1"/>
-						<line number="262" hits="1"/>
-						<line number="263" hits="0"/>
-						<line number="271" hits="1"/>
-						<line number="274" hits="1"/>
-						<line number="275" hits="1"/>
-						<line number="276" hits="1"/>
-						<line number="277" hits="1"/>
-						<line number="278" hits="1"/>
-						<line number="280" hits="0"/>
-						<line number="281" hits="1"/>
-						<line number="284" hits="1"/>
-						<line number="293" hits="1"/>
-						<line number="294" hits="1"/>
-						<line number="299" hits="1"/>
-						<line number="300" hits="0"/>
-						<line number="302" hits="1"/>
-						<line number="303" hits="1"/>
-						<line number="305" hits="0"/>
-						<line number="308" hits="1"/>
-						<line number="309" hits="1"/>
-						<line number="310" hits="1"/>
-						<line number="311" hits="1"/>
-						<line number="314" hits="1"/>
-						<line number="315" hits="0"/>
-						<line number="318" hits="1"/>
-						<line number="319" hits="0"/>
-						<line number="323" hits="1"/>
-						<line number="325" hits="1"/>
-						<line number="326" hits="1"/>
-						<line number="327" hits="1"/>
-						<line number="338" hits="1"/>
-						<line number="339" hits="1"/>
-						<line number="342" hits="1"/>
-						<line number="344" hits="1"/>
-						<line number="345" hits="1"/>
-						<line number="346" hits="1"/>
-						<line number="347" hits="1"/>
-						<line number="350" hits="1"/>
-						<line number="351" hits="0"/>
-						<line number="358" hits="1"/>
-						<line number="359" hits="1"/>
-						<line number="360" hits="1"/>
-						<line number="361" hits="1"/>
-						<line number="362" hits="1"/>
-						<line number="365" hits="1"/>
-						<line number="366" hits="1"/>
-						<line number="367" hits="1"/>
-						<line number="368" hits="1"/>
-						<line number="369" hits="1"/>
-						<line number="370" hits="1"/>
-						<line number="371" hits="1"/>
-					</lines>
-				</class>
-				<class name="commands.py" filename="commands.py" complexity="0" line-rate="0.6143" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="56" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="0"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="0"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="100" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="107" hits="1"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="116" hits="1"/>
-					</lines>
-				</class>
-				<class name="db.py" filename="db.py" complexity="0" line-rate="0.744" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="0"/>
-						<line number="94" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="100" hits="1"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="143" hits="1"/>
-						<line number="144" hits="1"/>
-						<line number="145" hits="1"/>
-						<line number="146" hits="1"/>
-						<line number="148" hits="1"/>
-						<line number="150" hits="1"/>
-						<line number="151" hits="1"/>
-						<line number="153" hits="1"/>
-						<line number="154" hits="1"/>
-						<line number="155" hits="1"/>
-						<line number="156" hits="1"/>
-						<line number="157" hits="1"/>
-						<line number="158" hits="1"/>
-						<line number="159" hits="1"/>
-						<line number="161" hits="1"/>
-						<line number="162" hits="1"/>
-						<line number="163" hits="1"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="171" hits="1"/>
-						<line number="173" hits="1"/>
-						<line number="175" hits="1"/>
-						<line number="176" hits="1"/>
-						<line number="177" hits="1"/>
-						<line number="178" hits="1"/>
-						<line number="180" hits="1"/>
-						<line number="181" hits="1"/>
-						<line number="182" hits="1"/>
-						<line number="183" hits="1"/>
-						<line number="184" hits="1"/>
-						<line number="185" hits="1"/>
-						<line number="187" hits="1"/>
-						<line number="188" hits="1"/>
-						<line number="189" hits="1"/>
-						<line number="191" hits="1"/>
-						<line number="192" hits="1"/>
-						<line number="193" hits="0"/>
-					</lines>
-				</class>
-				<class name="decorators.py" filename="decorators.py" complexity="0" line-rate="0.8095" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="0"/>
-						<line number="70" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="116" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="131" hits="1"/>
-						<line number="133" hits="1"/>
-						<line number="134" hits="0"/>
-						<line number="136" hits="1"/>
-						<line number="138" hits="1"/>
-						<line number="139" hits="1"/>
-						<line number="140" hits="1"/>
-						<line number="141" hits="1"/>
-						<line number="142" hits="1"/>
-						<line number="145" hits="0"/>
-						<line number="148" hits="1"/>
-						<line number="149" hits="1"/>
-						<line number="150" hits="1"/>
-						<line number="151" hits="0"/>
-						<line number="152" hits="1"/>
-						<line number="153" hits="1"/>
-						<line number="154" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="157" hits="1"/>
-						<line number="158" hits="1"/>
-						<line number="159" hits="1"/>
-						<line number="160" hits="1"/>
-						<line number="161" hits="1"/>
-						<line number="164" hits="0"/>
-						<line number="167" hits="1"/>
-						<line number="168" hits="1"/>
-						<line number="169" hits="1"/>
-						<line number="170" hits="0"/>
-						<line number="171" hits="1"/>
-						<line number="172" hits="1"/>
-						<line number="173" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="178" hits="1"/>
-						<line number="183" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="197" hits="1"/>
-						<line number="202" hits="1"/>
-						<line number="204" hits="1"/>
-						<line number="206" hits="1"/>
-						<line number="209" hits="1"/>
-						<line number="214" hits="1"/>
-						<line number="217" hits="1"/>
-						<line number="218" hits="1"/>
-						<line number="219" hits="1"/>
-						<line number="220" hits="0"/>
-						<line number="224" hits="1"/>
-						<line number="225" hits="0"/>
-						<line number="229" hits="1"/>
-						<line number="230" hits="0"/>
-						<line number="232" hits="1"/>
-					</lines>
-				</class>
-				<class name="helpers.py" filename="helpers.py" complexity="0" line-rate="0.8547" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="0"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="122" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="1"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="1"/>
-						<line number="132" hits="1"/>
-						<line number="134" hits="1"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="1"/>
-						<line number="137" hits="1"/>
-						<line number="138" hits="1"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="142" hits="1"/>
-						<line number="145" hits="1"/>
-						<line number="146" hits="1"/>
-						<line number="149" hits="1"/>
-						<line number="150" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="158" hits="1"/>
-						<line number="159" hits="1"/>
-						<line number="165" hits="1"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="1"/>
-						<line number="168" hits="1"/>
-						<line number="169" hits="1"/>
-						<line number="170" hits="1"/>
-						<line number="171" hits="1"/>
-						<line number="172" hits="1"/>
-						<line number="173" hits="1"/>
-						<line number="174" hits="1"/>
-						<line number="175" hits="1"/>
-						<line number="176" hits="0"/>
-						<line number="178" hits="1"/>
-						<line number="179" hits="1"/>
-						<line number="180" hits="1"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="185" hits="1"/>
-					</lines>
-				</class>
-				<class name="jinja2_templating.py" filename="jinja2_templating.py" complexity="0" line-rate="0.875" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="lnurl.py" complexity="0" line-rate="0.25" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="6" hits="0"/>
-						<line number="7" hits="0"/>
-						<line number="8" hits="0"/>
-						<line number="9" hits="0"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="15" hits="0"/>
-						<line number="16" hits="0"/>
-					</lines>
-				</class>
-				<class name="proxy_fix.py" filename="proxy_fix.py" complexity="0" line-rate="0" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="0"/>
-						<line number="2" hits="0"/>
-						<line number="3" hits="0"/>
-						<line number="4" hits="0"/>
-						<line number="6" hits="0"/>
-						<line number="7" hits="0"/>
-						<line number="8" hits="0"/>
-						<line number="11" hits="0"/>
-						<line number="12" hits="0"/>
-						<line number="13" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="15" hits="0"/>
-						<line number="16" hits="0"/>
-						<line number="17" hits="0"/>
-						<line number="18" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-					</lines>
-				</class>
-				<class name="requestvars.py" filename="requestvars.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-					</lines>
-				</class>
-				<class name="server.py" filename="server.py" complexity="0" line-rate="0" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="0"/>
-						<line number="3" hits="0"/>
-						<line number="4" hits="0"/>
-						<line number="6" hits="0"/>
-						<line number="9" hits="0"/>
-						<line number="15" hits="0"/>
-						<line number="16" hits="0"/>
-						<line number="17" hits="0"/>
-						<line number="18" hits="0"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-					</lines>
-				</class>
-				<class name="settings.py" filename="settings.py" complexity="0" line-rate="0.9444" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="tasks.py" complexity="0" line-rate="0.403" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="0"/>
-						<line number="51" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="109" hits="1"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="core" line-rate="0.5319" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="core/__init__.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="core/crud.py" complexity="0" line-rate="0.5683" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="59" hits="0"/>
-						<line number="61" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="1"/>
-						<line number="112" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="118" hits="0"/>
-						<line number="128" hits="1"/>
-						<line number="131" hits="0"/>
-						<line number="144" hits="1"/>
-						<line number="147" hits="1"/>
-						<line number="156" hits="1"/>
-						<line number="159" hits="1"/>
-						<line number="162" hits="1"/>
-						<line number="171" hits="1"/>
-						<line number="172" hits="1"/>
-						<line number="174" hits="1"/>
-						<line number="175" hits="1"/>
-						<line number="177" hits="1"/>
-						<line number="184" hits="1"/>
-						<line number="190" hits="1"/>
-						<line number="191" hits="1"/>
-						<line number="192" hits="1"/>
-						<line number="193" hits="0"/>
-						<line number="195" hits="1"/>
-						<line number="196" hits="1"/>
-						<line number="197" hits="1"/>
-						<line number="199" hits="1"/>
-						<line number="209" hits="1"/>
-						<line number="212" hits="1"/>
-						<line number="215" hits="1"/>
-						<line number="224" hits="1"/>
-						<line number="227" hits="1"/>
-						<line number="244" hits="0"/>
-						<line number="245" hits="0"/>
-						<line number="247" hits="0"/>
-						<line number="248" hits="0"/>
-						<line number="249" hits="0"/>
-						<line number="250" hits="0"/>
-						<line number="251" hits="0"/>
-						<line number="253" hits="0"/>
-						<line number="254" hits="0"/>
-						<line number="256" hits="0"/>
-						<line number="257" hits="0"/>
-						<line number="258" hits="0"/>
-						<line number="260" hits="0"/>
-						<line number="261" hits="0"/>
-						<line number="262" hits="0"/>
-						<line number="263" hits="0"/>
-						<line number="264" hits="0"/>
-						<line number="265" hits="0"/>
-						<line number="269" hits="0"/>
-						<line number="270" hits="0"/>
-						<line number="271" hits="0"/>
-						<line number="272" hits="0"/>
-						<line number="273" hits="0"/>
-						<line number="274" hits="0"/>
-						<line number="278" hits="0"/>
-						<line number="279" hits="0"/>
-						<line number="280" hits="0"/>
-						<line number="282" hits="0"/>
-						<line number="283" hits="0"/>
-						<line number="285" hits="0"/>
-						<line number="291" hits="0"/>
-						<line number="292" hits="0"/>
-						<line number="293" hits="0"/>
-						<line number="295" hits="0"/>
-						<line number="305" hits="0"/>
-						<line number="308" hits="1"/>
-						<line number="312" hits="0"/>
-						<line number="321" hits="0"/>
-						<line number="330" hits="0"/>
-						<line number="331" hits="0"/>
-						<line number="332" hits="0"/>
-						<line number="333" hits="0"/>
-						<line number="334" hits="0"/>
-						<line number="336" hits="0"/>
-						<line number="337" hits="0"/>
-						<line number="338" hits="0"/>
-						<line number="339" hits="0"/>
-						<line number="340" hits="0"/>
-						<line number="353" hits="1"/>
-						<line number="368" hits="1"/>
-						<line number="392" hits="1"/>
-						<line number="393" hits="1"/>
-						<line number="395" hits="1"/>
-						<line number="398" hits="1"/>
-						<line number="401" hits="1"/>
-						<line number="407" hits="1"/>
-						<line number="408" hits="1"/>
-						<line number="413" hits="1"/>
-						<line number="416" hits="1"/>
-						<line number="423" hits="1"/>
-						<line number="424" hits="1"/>
-						<line number="426" hits="1"/>
-						<line number="433" hits="1"/>
-						<line number="436" hits="0"/>
-						<line number="438" hits="0"/>
-						<line number="447" hits="1"/>
-						<line number="450" hits="0"/>
-						<line number="458" hits="0"/>
-						<line number="461" hits="1"/>
-						<line number="462" hits="0"/>
-						<line number="463" hits="0"/>
-						<line number="470" hits="1"/>
-						<line number="473" hits="0"/>
-						<line number="482" hits="1"/>
-						<line number="485" hits="0"/>
-						<line number="493" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="core/migrations.py" complexity="0" line-rate="0.1795" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="84" hits="1"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="129" hits="1"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="139" hits="1"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="164" hits="1"/>
-						<line number="169" hits="0"/>
-						<line number="181" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="core/models.py" complexity="0" line-rate="0.6638" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="0"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="107" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="115" hits="0"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="0"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="1"/>
-						<line number="123" hits="0"/>
-						<line number="125" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="1"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="1"/>
-						<line number="131" hits="0"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="140" hits="1"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="166" hits="1"/>
-						<line number="167" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="172" hits="1"/>
-						<line number="173" hits="1"/>
-						<line number="174" hits="1"/>
-						<line number="175" hits="1"/>
-						<line number="177" hits="1"/>
-						<line number="178" hits="1"/>
-						<line number="179" hits="0"/>
-					</lines>
-				</class>
-				<class name="services.py" filename="core/services.py" complexity="0" line-rate="0.5322" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="0"/>
-						<line number="73" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="100" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="0"/>
-						<line number="112" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="1"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="130" hits="1"/>
-						<line number="131" hits="1"/>
-						<line number="132" hits="1"/>
-						<line number="134" hits="1"/>
-						<line number="142" hits="1"/>
-						<line number="145" hits="1"/>
-						<line number="153" hits="1"/>
-						<line number="154" hits="1"/>
-						<line number="155" hits="1"/>
-						<line number="156" hits="1"/>
-						<line number="157" hits="1"/>
-						<line number="158" hits="0"/>
-						<line number="161" hits="1"/>
-						<line number="163" hits="1"/>
-						<line number="164" hits="1"/>
-						<line number="168" hits="1"/>
-						<line number="169" hits="1"/>
-						<line number="175" hits="1"/>
-						<line number="177" hits="1"/>
-						<line number="179" hits="1"/>
-						<line number="181" hits="1"/>
-						<line number="184" hits="1"/>
-						<line number="185" hits="1"/>
-						<line number="186" hits="1"/>
-						<line number="187" hits="1"/>
-						<line number="188" hits="1"/>
-						<line number="196" hits="1"/>
-						<line number="197" hits="1"/>
-						<line number="199" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="207" hits="1"/>
-						<line number="208" hits="1"/>
-						<line number="211" hits="1"/>
-						<line number="219" hits="0"/>
-						<line number="220" hits="0"/>
-						<line number="222" hits="0"/>
-						<line number="224" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="226" hits="0"/>
-						<line number="227" hits="0"/>
-						<line number="229" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="237" hits="0"/>
-						<line number="238" hits="0"/>
-						<line number="241" hits="0"/>
-						<line number="243" hits="0"/>
-						<line number="244" hits="0"/>
-						<line number="246" hits="0"/>
-						<line number="248" hits="0"/>
-						<line number="249" hits="0"/>
-						<line number="254" hits="0"/>
-						<line number="255" hits="0"/>
-						<line number="257" hits="0"/>
-						<line number="258" hits="0"/>
-						<line number="259" hits="0"/>
-						<line number="260" hits="0"/>
-						<line number="261" hits="0"/>
-						<line number="264" hits="1"/>
-						<line number="269" hits="0"/>
-						<line number="271" hits="0"/>
-						<line number="273" hits="0"/>
-						<line number="275" hits="0"/>
-						<line number="277" hits="0"/>
-						<line number="279" hits="0"/>
-						<line number="281" hits="0"/>
-						<line number="283" hits="0"/>
-						<line number="286" hits="0"/>
-						<line number="288" hits="0"/>
-						<line number="290" hits="0"/>
-						<line number="293" hits="0"/>
-						<line number="294" hits="0"/>
-						<line number="298" hits="0"/>
-						<line number="299" hits="0"/>
-						<line number="301" hits="0"/>
-						<line number="302" hits="0"/>
-						<line number="303" hits="0"/>
-						<line number="305" hits="0"/>
-						<line number="306" hits="0"/>
-						<line number="307" hits="0"/>
-						<line number="308" hits="0"/>
-						<line number="309" hits="0"/>
-						<line number="310" hits="0"/>
-						<line number="311" hits="0"/>
-						<line number="312" hits="0"/>
-						<line number="313" hits="0"/>
-						<line number="315" hits="0"/>
-						<line number="317" hits="0"/>
-						<line number="319" hits="0"/>
-						<line number="320" hits="0"/>
-						<line number="328" hits="0"/>
-						<line number="329" hits="0"/>
-						<line number="330" hits="0"/>
-						<line number="331" hits="0"/>
-						<line number="333" hits="0"/>
-						<line number="334" hits="0"/>
-						<line number="335" hits="0"/>
-						<line number="340" hits="1"/>
-						<line number="343" hits="1"/>
-						<line number="344" hits="1"/>
-						<line number="345" hits="0"/>
-						<line number="346" hits="1"/>
-						<line number="347" hits="1"/>
-						<line number="349" hits="0"/>
-						<line number="350" hits="1"/>
-						<line number="351" hits="1"/>
-						<line number="352" hits="0"/>
-						<line number="353" hits="0"/>
-						<line number="354" hits="0"/>
-						<line number="355" hits="0"/>
-						<line number="356" hits="0"/>
-						<line number="359" hits="0"/>
-						<line number="360" hits="0"/>
-						<line number="364" hits="1"/>
-						<line number="365" hits="1"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="core/tasks.py" complexity="0" line-rate="0.3111" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="0"/>
-						<line number="18" hits="0"/>
-						<line number="19" hits="0"/>
-						<line number="22" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="core.views" line-rate="0.4693" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="core/views/__init__.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines/>
-				</class>
-				<class name="api.py" filename="core/views/api.py" complexity="0" line-rate="0.4118" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="100" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="112" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="118" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="138" hits="1"/>
-						<line number="139" hits="1"/>
-						<line number="140" hits="1"/>
-						<line number="141" hits="1"/>
-						<line number="142" hits="1"/>
-						<line number="143" hits="1"/>
-						<line number="144" hits="1"/>
-						<line number="145" hits="1"/>
-						<line number="146" hits="1"/>
-						<line number="147" hits="1"/>
-						<line number="148" hits="1"/>
-						<line number="149" hits="1"/>
-						<line number="152" hits="1"/>
-						<line number="153" hits="1"/>
-						<line number="154" hits="1"/>
-						<line number="155" hits="1"/>
-						<line number="157" hits="1"/>
-						<line number="158" hits="1"/>
-						<line number="159" hits="1"/>
-						<line number="160" hits="1"/>
-						<line number="162" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="166" hits="1"/>
-						<line number="167" hits="1"/>
-						<line number="168" hits="1"/>
-						<line number="178" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="183" hits="1"/>
-						<line number="185" hits="1"/>
-						<line number="186" hits="1"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="191" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="207" hits="0"/>
-						<line number="208" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="211" hits="0"/>
-						<line number="212" hits="0"/>
-						<line number="213" hits="0"/>
-						<line number="215" hits="1"/>
-						<line number="224" hits="1"/>
-						<line number="225" hits="1"/>
-						<line number="226" hits="1"/>
-						<line number="227" hits="0"/>
-						<line number="228" hits="0"/>
-						<line number="229" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="231" hits="0"/>
-						<line number="232" hits="0"/>
-						<line number="233" hits="0"/>
-						<line number="234" hits="0"/>
-						<line number="236" hits="1"/>
-						<line number="243" hits="1"/>
-						<line number="247" hits="1"/>
-						<line number="251" hits="1"/>
-						<line number="252" hits="1"/>
-						<line number="253" hits="0"/>
-						<line number="257" hits="1"/>
-						<line number="260" hits="1"/>
-						<line number="262" hits="1"/>
-						<line number="264" hits="1"/>
-						<line number="270" hits="1"/>
-						<line number="271" hits="1"/>
-						<line number="272" hits="1"/>
-						<line number="273" hits="1"/>
-						<line number="274" hits="1"/>
-						<line number="275" hits="1"/>
-						<line number="278" hits="1"/>
-						<line number="279" hits="1"/>
-						<line number="282" hits="0"/>
-						<line number="284" hits="0"/>
-						<line number="285" hits="0"/>
-						<line number="286" hits="0"/>
-						<line number="291" hits="0"/>
-						<line number="292" hits="0"/>
-						<line number="293" hits="0"/>
-						<line number="294" hits="0"/>
-						<line number="299" hits="0"/>
-						<line number="300" hits="0"/>
-						<line number="301" hits="0"/>
-						<line number="306" hits="0"/>
-						<line number="307" hits="0"/>
-						<line number="312" hits="0"/>
-						<line number="313" hits="0"/>
-						<line number="314" hits="0"/>
-						<line number="319" hits="0"/>
-						<line number="320" hits="0"/>
-						<line number="325" hits="0"/>
-						<line number="327" hits="0"/>
-						<line number="328" hits="0"/>
-						<line number="329" hits="0"/>
-						<line number="330" hits="0"/>
-						<line number="331" hits="0"/>
-						<line number="332" hits="0"/>
-						<line number="339" hits="0"/>
-						<line number="347" hits="1"/>
-						<line number="348" hits="0"/>
-						<line number="350" hits="0"/>
-						<line number="352" hits="0"/>
-						<line number="353" hits="0"/>
-						<line number="355" hits="0"/>
-						<line number="357" hits="0"/>
-						<line number="359" hits="0"/>
-						<line number="360" hits="0"/>
-						<line number="361" hits="0"/>
-						<line number="362" hits="0"/>
-						<line number="364" hits="0"/>
-						<line number="366" hits="0"/>
-						<line number="368" hits="0"/>
-						<line number="370" hits="0"/>
-						<line number="371" hits="0"/>
-						<line number="375" hits="0"/>
-						<line number="377" hits="0"/>
-						<line number="378" hits="0"/>
-						<line number="381" hits="1"/>
-						<line number="382" hits="1"/>
-						<line number="385" hits="0"/>
-						<line number="390" hits="1"/>
-						<line number="391" hits="1"/>
-						<line number="394" hits="1"/>
-						<line number="398" hits="1"/>
-						<line number="401" hits="1"/>
-						<line number="402" hits="0"/>
-						<line number="405" hits="1"/>
-						<line number="406" hits="1"/>
-						<line number="409" hits="1"/>
-						<line number="410" hits="0"/>
-						<line number="413" hits="1"/>
-						<line number="414" hits="1"/>
-						<line number="415" hits="1"/>
-						<line number="416" hits="1"/>
-						<line number="418" hits="0"/>
-						<line number="419" hits="0"/>
-						<line number="420" hits="0"/>
-						<line number="421" hits="0"/>
-						<line number="422" hits="0"/>
-						<line number="423" hits="0"/>
-						<line number="425" hits="0"/>
-						<line number="426" hits="0"/>
-						<line number="431" hits="0"/>
-						<line number="434" hits="1"/>
-						<line number="435" hits="1"/>
-						<line number="436" hits="0"/>
-						<line number="437" hits="0"/>
-						<line number="438" hits="0"/>
-						<line number="439" hits="0"/>
-						<line number="441" hits="0"/>
-						<line number="442" hits="0"/>
-						<line number="443" hits="0"/>
-						<line number="444" hits="0"/>
-						<line number="452" hits="0"/>
-						<line number="457" hits="0"/>
-						<line number="459" hits="0"/>
-						<line number="460" hits="0"/>
-						<line number="461" hits="0"/>
-						<line number="463" hits="0"/>
-						<line number="464" hits="0"/>
-						<line number="466" hits="0"/>
-						<line number="467" hits="0"/>
-						<line number="468" hits="0"/>
-						<line number="469" hits="0"/>
-						<line number="474" hits="0"/>
-						<line number="475" hits="0"/>
-						<line number="476" hits="0"/>
-						<line number="477" hits="0"/>
-						<line number="485" hits="0"/>
-						<line number="486" hits="0"/>
-						<line number="487" hits="0"/>
-						<line number="488" hits="0"/>
-						<line number="489" hits="0"/>
-						<line number="497" hits="0"/>
-						<line number="498" hits="0"/>
-						<line number="499" hits="0"/>
-						<line number="502" hits="0"/>
-						<line number="503" hits="0"/>
-						<line number="504" hits="0"/>
-						<line number="507" hits="0"/>
-						<line number="508" hits="0"/>
-						<line number="511" hits="0"/>
-						<line number="514" hits="0"/>
-						<line number="515" hits="0"/>
-						<line number="516" hits="0"/>
-						<line number="517" hits="0"/>
-						<line number="519" hits="0"/>
-						<line number="524" hits="0"/>
-						<line number="525" hits="0"/>
-						<line number="526" hits="0"/>
-						<line number="527" hits="0"/>
-						<line number="528" hits="0"/>
-						<line number="529" hits="0"/>
-						<line number="530" hits="0"/>
-						<line number="531" hits="0"/>
-						<line number="532" hits="0"/>
-						<line number="533" hits="0"/>
-						<line number="535" hits="0"/>
-						<line number="536" hits="0"/>
-						<line number="544" hits="0"/>
-						<line number="547" hits="1"/>
-						<line number="548" hits="1"/>
-						<line number="551" hits="1"/>
-						<line number="552" hits="1"/>
-						<line number="553" hits="1"/>
-						<line number="554" hits="1"/>
-						<line number="555" hits="1"/>
-						<line number="556" hits="0"/>
-						<line number="557" hits="0"/>
-						<line number="559" hits="1"/>
-						<line number="560" hits="1"/>
-						<line number="572" hits="0"/>
-						<line number="573" hits="0"/>
-						<line number="576" hits="1"/>
-						<line number="577" hits="1"/>
-						<line number="580" hits="1"/>
-						<line number="581" hits="1"/>
-						<line number="584" hits="0"/>
-						<line number="585" hits="0"/>
-						<line number="586" hits="0"/>
-						<line number="589" hits="0"/>
-						<line number="592" hits="1"/>
-						<line number="593" hits="1"/>
-						<line number="594" hits="0"/>
-						<line number="597" hits="1"/>
-						<line number="598" hits="1"/>
-						<line number="599" hits="1"/>
-						<line number="600" hits="1"/>
-						<line number="603" hits="1"/>
-						<line number="604" hits="1"/>
-						<line number="605" hits="0"/>
-						<line number="606" hits="0"/>
-						<line number="607" hits="0"/>
-						<line number="608" hits="0"/>
-						<line number="609" hits="0"/>
-						<line number="610" hits="0"/>
-						<line number="613" hits="0"/>
-						<line number="615" hits="0"/>
-						<line number="616" hits="0"/>
-						<line number="617" hits="0"/>
-						<line number="618" hits="0"/>
-						<line number="621" hits="1"/>
-						<line number="622" hits="1"/>
-						<line number="623" hits="0"/>
-						<line number="624" hits="0"/>
-						<line number="625" hits="0"/>
-						<line number="626" hits="0"/>
-						<line number="628" hits="0"/>
-						<line number="629" hits="0"/>
-						<line number="631" hits="0"/>
-					</lines>
-				</class>
-				<class name="generic.py" filename="core/views/generic.py" complexity="0" line-rate="0.5896" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="122" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="1"/>
-						<line number="128" hits="0"/>
-						<line number="131" hits="1"/>
-						<line number="132" hits="0"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="1"/>
-						<line number="138" hits="1"/>
-						<line number="139" hits="1"/>
-						<line number="141" hits="1"/>
-						<line number="142" hits="1"/>
-						<line number="146" hits="1"/>
-						<line number="151" hits="1"/>
-						<line number="154" hits="1"/>
-						<line number="155" hits="1"/>
-						<line number="156" hits="0"/>
-						<line number="160" hits="1"/>
-						<line number="172" hits="1"/>
-						<line number="173" hits="1"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="176" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="193" hits="1"/>
-						<line number="194" hits="1"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="199" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="206" hits="0"/>
-						<line number="207" hits="0"/>
-						<line number="208" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="211" hits="0"/>
-						<line number="213" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="217" hits="0"/>
-						<line number="220" hits="1"/>
-						<line number="221" hits="1"/>
-						<line number="222" hits="0"/>
-						<line number="223" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="226" hits="0"/>
-						<line number="228" hits="0"/>
-						<line number="229" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="232" hits="0"/>
-						<line number="233" hits="0"/>
-						<line number="238" hits="0"/>
-						<line number="243" hits="1"/>
-						<line number="244" hits="1"/>
-						<line number="245" hits="0"/>
-						<line number="246" hits="0"/>
-						<line number="247" hits="0"/>
-						<line number="250" hits="1"/>
-						<line number="253" hits="1"/>
-						<line number="254" hits="0"/>
-						<line number="255" hits="0"/>
-						<line number="256" hits="0"/>
-						<line number="257" hits="0"/>
-						<line number="259" hits="0"/>
-						<line number="269" hits="0"/>
-						<line number="275" hits="1"/>
-						<line number="276" hits="1"/>
-						<line number="277" hits="0"/>
-						<line number="280" hits="1"/>
-						<line number="281" hits="1"/>
-						<line number="282" hits="0"/>
-						<line number="283" hits="0"/>
-						<line number="284" hits="0"/>
-						<line number="286" hits="0"/>
-					</lines>
-				</class>
-				<class name="public_api.py" filename="core/views/public_api.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.bleskomat" line-rate="0.747" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/bleskomat/__init__.py" complexity="0" line-rate="0.9167" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/bleskomat/crud.py" complexity="0" line-rate="0.7872" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="0"/>
-						<line number="78" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="105" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="1"/>
-						<line number="113" hits="1"/>
-					</lines>
-				</class>
-				<class name="exchange_rates.py" filename="extensions/bleskomat/exchange_rates.py" complexity="0" line-rate="0.7692" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="77" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-					</lines>
-				</class>
-				<class name="helpers.py" filename="extensions/bleskomat/helpers.py" complexity="0" line-rate="0.6023" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="0"/>
-						<line number="75" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="154" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl_api.py" filename="extensions/bleskomat/lnurl_api.py" complexity="0" line-rate="0.8841" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="0"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="100" hits="1"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="0"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="129" hits="1"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/bleskomat/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="0"/>
-						<line number="20" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/bleskomat/models.py" complexity="0" line-rate="0.8774" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="0"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="0"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="112" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="1"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="1"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="130" hits="1"/>
-						<line number="132" hits="1"/>
-						<line number="133" hits="1"/>
-						<line number="134" hits="1"/>
-						<line number="143" hits="1"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/bleskomat/views.py" complexity="0" line-rate="0.8571" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="0"/>
-						<line number="23" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/bleskomat/views_api.py" complexity="0" line-rate="0.413" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="89" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.copilot" line-rate="0.5593" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/copilot/__init__.py" complexity="0" line-rate="0.9444" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/copilot/crud.py" complexity="0" line-rate="0.3913" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="0"/>
-						<line number="15" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="extensions/copilot/lnurl.py" complexity="0" line-rate="0.3846" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="40" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/copilot/migrations.py" complexity="0" line-rate="0.375" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="6" hits="0"/>
-						<line number="36" hits="1"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="0"/>
-						<line number="77" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/copilot/models.py" complexity="0" line-rate="0.9661" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/copilot/tasks.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="0"/>
-						<line number="75" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/copilot/views.py" complexity="0" line-rate="0.5625" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="0"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="0"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="63" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/copilot/views_api.py" complexity="0" line-rate="0.4038" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="72" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.discordbot" line-rate="0.5796" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/discordbot/__init__.py" complexity="0" line-rate="0.9091" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/discordbot/crud.py" complexity="0" line-rate="0.3191" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="78" hits="1"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="0"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/discordbot/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="19" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/discordbot/models.py" complexity="0" line-rate="0.9643" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/discordbot/views.py" complexity="0" line-rate="0.8889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/discordbot/views_api.py" complexity="0" line-rate="0.5085" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="89" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="105" hits="0"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="112" hits="0"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="1"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.events" line-rate="0.4431" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/events/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="0"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/events/crud.py" complexity="0" line-rate="0.2615" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="0"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="0"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="138" hits="1"/>
-						<line number="139" hits="0"/>
-						<line number="145" hits="1"/>
-						<line number="146" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="153" hits="1"/>
-						<line number="154" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="161" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/events/migrations.py" complexity="0" line-rate="0.1429" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="40" hits="1"/>
-						<line number="42" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="83" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/events/models.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/events/views.py" complexity="0" line-rate="0.4878" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="99" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/events/views_api.py" complexity="0" line-rate="0.3407" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="92" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="100" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="146" hits="1"/>
-						<line number="147" hits="1"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="166" hits="1"/>
-						<line number="167" hits="1"/>
-						<line number="168" hits="0"/>
-						<line number="174" hits="1"/>
-						<line number="175" hits="1"/>
-						<line number="176" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="192" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.hivemind" line-rate="0.8824" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/hivemind/__init__.py" complexity="0" line-rate="0.875" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/hivemind/migrations.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines/>
-				</class>
-				<class name="views.py" filename="extensions/hivemind/views.py" complexity="0" line-rate="0.8889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.invoices" line-rate="0.7397" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/invoices/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/invoices/crud.py" complexity="0" line-rate="0.5147" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="124" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="149" hits="1"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="186" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="190" hits="1"/>
-						<line number="191" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="206" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/invoices/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="42" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/invoices/models.py" complexity="0" line-rate="0.9872" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/invoices/tasks.py" complexity="0" line-rate="0.44" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="51" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/invoices/views.py" complexity="0" line-rate="0.76" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="47" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/invoices/views_api.py" complexity="0" line-rate="0.76" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="86" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="100" hits="0"/>
-						<line number="104" hits="1"/>
-						<line number="105" hits="0"/>
-						<line number="109" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="123" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="1"/>
-						<line number="131" hits="1"/>
-						<line number="132" hits="0"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="1"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="1"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.jukebox" line-rate="0.3627" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/jukebox/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/jukebox/crud.py" complexity="0" line-rate="0.2889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="13" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="38" hits="1"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="0"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="95" hits="1"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="0"/>
-						<line number="110" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/jukebox/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="30" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/jukebox/models.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/jukebox/tasks.py" complexity="0" line-rate="0.6923" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="0"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/jukebox/views.py" complexity="0" line-rate="0.5926" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="49" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/jukebox/views_api.py" complexity="0" line-rate="0.1711" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="1"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="159" hits="1"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="162" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="191" hits="0"/>
-						<line number="197" hits="1"/>
-						<line number="198" hits="1"/>
-						<line number="201" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="206" hits="0"/>
-						<line number="211" hits="0"/>
-						<line number="212" hits="0"/>
-						<line number="213" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="216" hits="0"/>
-						<line number="219" hits="0"/>
-						<line number="220" hits="0"/>
-						<line number="224" hits="0"/>
-						<line number="226" hits="0"/>
-						<line number="234" hits="1"/>
-						<line number="235" hits="1"/>
-						<line number="236" hits="0"/>
-						<line number="237" hits="0"/>
-						<line number="239" hits="0"/>
-						<line number="240" hits="0"/>
-						<line number="241" hits="0"/>
-						<line number="243" hits="0"/>
-						<line number="244" hits="0"/>
-						<line number="245" hits="0"/>
-						<line number="246" hits="0"/>
-						<line number="247" hits="0"/>
-						<line number="248" hits="0"/>
-						<line number="249" hits="0"/>
-						<line number="252" hits="0"/>
-						<line number="253" hits="0"/>
-						<line number="257" hits="0"/>
-						<line number="264" hits="0"/>
-						<line number="265" hits="0"/>
-						<line number="268" hits="0"/>
-						<line number="270" hits="0"/>
-						<line number="273" hits="1"/>
-						<line number="274" hits="1"/>
-						<line number="277" hits="0"/>
-						<line number="278" hits="0"/>
-						<line number="279" hits="0"/>
-						<line number="280" hits="0"/>
-						<line number="281" hits="0"/>
-						<line number="282" hits="0"/>
-						<line number="283" hits="0"/>
-						<line number="284" hits="0"/>
-						<line number="285" hits="0"/>
-						<line number="286" hits="0"/>
-						<line number="287" hits="0"/>
-						<line number="289" hits="0"/>
-						<line number="292" hits="1"/>
-						<line number="293" hits="1"/>
-						<line number="299" hits="0"/>
-						<line number="300" hits="0"/>
-						<line number="301" hits="0"/>
-						<line number="302" hits="0"/>
-						<line number="303" hits="0"/>
-						<line number="304" hits="0"/>
-						<line number="305" hits="0"/>
-						<line number="306" hits="0"/>
-						<line number="307" hits="0"/>
-						<line number="312" hits="0"/>
-						<line number="317" hits="0"/>
-						<line number="318" hits="0"/>
-						<line number="319" hits="0"/>
-						<line number="321" hits="0"/>
-						<line number="322" hits="0"/>
-						<line number="323" hits="0"/>
-						<line number="324" hits="0"/>
-						<line number="331" hits="0"/>
-						<line number="332" hits="0"/>
-						<line number="333" hits="0"/>
-						<line number="334" hits="0"/>
-						<line number="335" hits="0"/>
-						<line number="336" hits="0"/>
-						<line number="340" hits="0"/>
-						<line number="341" hits="0"/>
-						<line number="346" hits="0"/>
-						<line number="350" hits="0"/>
-						<line number="353" hits="0"/>
-						<line number="354" hits="0"/>
-						<line number="355" hits="0"/>
-						<line number="363" hits="0"/>
-						<line number="364" hits="0"/>
-						<line number="366" hits="0"/>
-						<line number="367" hits="0"/>
-						<line number="368" hits="0"/>
-						<line number="369" hits="0"/>
-						<line number="373" hits="0"/>
-						<line number="374" hits="0"/>
-						<line number="379" hits="0"/>
-						<line number="383" hits="0"/>
-						<line number="386" hits="0"/>
-						<line number="387" hits="0"/>
-						<line number="388" hits="0"/>
-						<line number="389" hits="0"/>
-						<line number="392" hits="0"/>
-						<line number="393" hits="0"/>
-						<line number="397" hits="0"/>
-						<line number="400" hits="0"/>
-						<line number="406" hits="1"/>
-						<line number="407" hits="1"/>
-						<line number="410" hits="0"/>
-						<line number="411" hits="0"/>
-						<line number="412" hits="0"/>
-						<line number="413" hits="0"/>
-						<line number="414" hits="0"/>
-						<line number="415" hits="0"/>
-						<line number="416" hits="0"/>
-						<line number="421" hits="0"/>
-						<line number="422" hits="0"/>
-						<line number="423" hits="0"/>
-						<line number="424" hits="0"/>
-						<line number="425" hits="0"/>
-						<line number="427" hits="0"/>
-						<line number="434" hits="0"/>
-						<line number="435" hits="0"/>
-						<line number="436" hits="0"/>
-						<line number="440" hits="0"/>
-						<line number="441" hits="0"/>
-						<line number="442" hits="0"/>
-						<line number="443" hits="0"/>
-						<line number="446" hits="0"/>
-						<line number="447" hits="0"/>
-						<line number="451" hits="0"/>
-						<line number="453" hits="0"/>
-						<line number="456" hits="0"/>
-						<line number="457" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.livestream" line-rate="0.4658" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/livestream/__init__.py" complexity="0" line-rate="0.9444" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/livestream/crud.py" complexity="0" line-rate="0.3016" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="0"/>
-						<line number="12" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="0"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="81" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="91" hits="1"/>
-						<line number="99" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="127" hits="1"/>
-						<line number="128" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="138" hits="1"/>
-						<line number="139" hits="0"/>
-						<line number="147" hits="1"/>
-						<line number="148" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="180" hits="1"/>
-						<line number="181" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="191" hits="1"/>
-						<line number="192" hits="0"/>
-						<line number="199" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="extensions/livestream/lnurl.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="106" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/livestream/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="16" hits="0"/>
-						<line number="28" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/livestream/models.py" complexity="0" line-rate="0.6557" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="72" hits="1"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/livestream/tasks.py" complexity="0" line-rate="0.4242" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="84" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/livestream/views.py" complexity="0" line-rate="0.6" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="44" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/livestream/views_api.py" complexity="0" line-rate="0.3846" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.lnaddress" line-rate="0.4324" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/lnaddress/__init__.py" complexity="0" line-rate="0.9375" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="0"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-					</lines>
-				</class>
-				<class name="cloudflare.py" filename="extensions/lnaddress/cloudflare.py" complexity="0" line-rate="0.2174" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/lnaddress/crud.py" complexity="0" line-rate="0.275" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="45" hits="1"/>
-						<line number="47" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="70" hits="1"/>
-						<line number="73" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="115" hits="0"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="147" hits="1"/>
-						<line number="148" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="164" hits="1"/>
-						<line number="165" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="172" hits="1"/>
-						<line number="174" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="186" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="191" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="extensions/lnaddress/lnurl.py" complexity="0" line-rate="0.4359" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="88" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/lnaddress/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="0"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/lnaddress/models.py" complexity="0" line-rate="0.913" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="57" hits="0"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/lnaddress/tasks.py" complexity="0" line-rate="0.3667" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="0"/>
-						<line number="20" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="61" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/lnaddress/views.py" complexity="0" line-rate="0.68" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/lnaddress/views_api.py" complexity="0" line-rate="0.2807" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="106" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="114" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="1"/>
-						<line number="123" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="139" hits="1"/>
-						<line number="140" hits="1"/>
-						<line number="141" hits="1"/>
-						<line number="144" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="162" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="171" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="176" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="210" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="218" hits="0"/>
-						<line number="219" hits="0"/>
-						<line number="224" hits="0"/>
-						<line number="227" hits="1"/>
-						<line number="228" hits="1"/>
-						<line number="229" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="231" hits="0"/>
-						<line number="232" hits="0"/>
-						<line number="233" hits="0"/>
-						<line number="234" hits="0"/>
-						<line number="235" hits="0"/>
-						<line number="237" hits="0"/>
-						<line number="238" hits="0"/>
-						<line number="240" hits="0"/>
-						<line number="243" hits="1"/>
-						<line number="244" hits="1"/>
-						<line number="245" hits="0"/>
-						<line number="246" hits="0"/>
-						<line number="247" hits="0"/>
-						<line number="250" hits="0"/>
-						<line number="251" hits="0"/>
-						<line number="255" hits="0"/>
-						<line number="256" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.lndhub" line-rate="0.6475" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/lndhub/__init__.py" complexity="0" line-rate="0.9091" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-					</lines>
-				</class>
-				<class name="decorators.py" filename="extensions/lndhub/decorators.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="42" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/lndhub/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="0"/>
-					</lines>
-				</class>
-				<class name="utils.py" filename="extensions/lndhub/utils.py" complexity="0" line-rate="0.6667" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="0"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/lndhub/views.py" complexity="0" line-rate="0.875" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/lndhub/views_api.py" complexity="0" line-rate="0.6234" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="114" hits="0"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="123" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="165" hits="1"/>
-						<line number="166" hits="1"/>
-						<line number="171" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="186" hits="0"/>
-						<line number="215" hits="1"/>
-						<line number="216" hits="1"/>
-						<line number="218" hits="0"/>
-						<line number="221" hits="1"/>
-						<line number="222" hits="1"/>
-						<line number="224" hits="0"/>
-						<line number="227" hits="1"/>
-						<line number="228" hits="1"/>
-						<line number="229" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="233" hits="1"/>
-						<line number="234" hits="1"/>
-						<line number="236" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.lnticket" line-rate="0.4539" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/lnticket/__init__.py" complexity="0" line-rate="0.9333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="0"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/lnticket/crud.py" complexity="0" line-rate="0.2581" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="0"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="134" hits="1"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="144" hits="1"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="149" hits="1"/>
-						<line number="150" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="161" hits="1"/>
-						<line number="162" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/lnticket/migrations.py" complexity="0" line-rate="0.1111" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="0"/>
-						<line number="19" hits="0"/>
-						<line number="37" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="87" hits="1"/>
-						<line number="89" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="133" hits="1"/>
-						<line number="135" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="162" hits="0"/>
-						<line number="177" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/lnticket/models.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/lnticket/tasks.py" complexity="0" line-rate="0.5263" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="0"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/lnticket/views.py" complexity="0" line-rate="0.7391" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/lnticket/views_api.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="91" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="99" hits="1"/>
-						<line number="100" hits="1"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="1"/>
-						<line number="137" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="150" hits="1"/>
-						<line number="151" hits="1"/>
-						<line number="152" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="162" hits="0"/>
-						<line number="163" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.lnurldevice" line-rate="0.4315" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/lnurldevice/__init__.py" complexity="0" line-rate="0.9" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/lnurldevice/crud.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="0"/>
-						<line number="15" hits="0"/>
-						<line number="16" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="0"/>
-						<line number="83" hits="1"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="108" hits="1"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="123" hits="1"/>
-						<line number="124" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="131" hits="1"/>
-						<line number="132" hits="0"/>
-						<line number="136" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="extensions/lnurldevice/lnurl.py" complexity="0" line-rate="0.1875" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="84" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="170" hits="1"/>
-						<line number="175" hits="1"/>
-						<line number="181" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="191" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="211" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="225" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/lnurldevice/migrations.py" complexity="0" line-rate="0.3077" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="10" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="39" hits="1"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/lnurldevice/models.py" complexity="0" line-rate="0.8837" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="0"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="0"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/lnurldevice/views.py" complexity="0" line-rate="0.6" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="28" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="50" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/lnurldevice/views_api.py" complexity="0" line-rate="0.5111" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="79" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="88" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.lnurlp" line-rate="0.468" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/lnurlp/__init__.py" complexity="0" line-rate="0.9444" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/lnurlp/crud.py" complexity="0" line-rate="0.2857" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="0"/>
-						<line number="12" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="extensions/lnurlp/lnurl.py" complexity="0" line-rate="0.2979" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="107" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/lnurlp/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="19" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="38" hits="1"/>
-						<line number="43" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="60" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/lnurlp/models.py" complexity="0" line-rate="0.6964" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="0"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/lnurlp/tasks.py" complexity="0" line-rate="0.4643" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/lnurlp/views.py" complexity="0" line-rate="0.6071" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="0"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/lnurlp/views_api.py" complexity="0" line-rate="0.3623" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="0"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="57" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="1"/>
-						<line number="126" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="142" hits="1"/>
-						<line number="143" hits="1"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="149" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.offlineshop" line-rate="0.4917" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/offlineshop/__init__.py" complexity="0" line-rate="0.9167" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/offlineshop/crud.py" complexity="0" line-rate="0.3684" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="0"/>
-						<line number="12" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="54" hits="1"/>
-						<line number="63" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="73" hits="1"/>
-						<line number="83" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="99" hits="1"/>
-						<line number="100" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="0"/>
-					</lines>
-				</class>
-				<class name="helpers.py" filename="extensions/offlineshop/helpers.py" complexity="0" line-rate="0.4615" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="0"/>
-						<line number="9" hits="0"/>
-						<line number="10" hits="0"/>
-						<line number="11" hits="0"/>
-						<line number="12" hits="0"/>
-						<line number="13" hits="0"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="extensions/offlineshop/lnurl.py" complexity="0" line-rate="0.3095" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="90" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/offlineshop/migrations.py" complexity="0" line-rate="0.4" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="16" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="37" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/offlineshop/models.py" complexity="0" line-rate="0.5222" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="0"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="0"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="112" hits="1"/>
-						<line number="113" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="120" hits="1"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="126" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/offlineshop/views.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="78" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/offlineshop/views_api.py" complexity="0" line-rate="0.5645" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="99" hits="1"/>
-						<line number="100" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="105" hits="1"/>
-						<line number="108" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="121" hits="0"/>
-					</lines>
-				</class>
-				<class name="wordlists.py" filename="extensions/offlineshop/wordlists.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.paywall" line-rate="0.5352" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/paywall/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/paywall/crud.py" complexity="0" line-rate="0.381" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="0"/>
-						<line number="11" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/paywall/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="22" hits="1"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="63" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/paywall/models.py" complexity="0" line-rate="0.871" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/paywall/views.py" complexity="0" line-rate="0.7059" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="0"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="28" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/paywall/views_api.py" complexity="0" line-rate="0.3393" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="83" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.satsdice" line-rate="0.4799" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/satsdice/__init__.py" complexity="0" line-rate="0.9" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/satsdice/crud.py" complexity="0" line-rate="0.2316" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="0"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="137" hits="1"/>
-						<line number="140" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="156" hits="1"/>
-						<line number="157" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="185" hits="1"/>
-						<line number="186" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="193" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="199" hits="1"/>
-						<line number="202" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="206" hits="0"/>
-						<line number="208" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="210" hits="0"/>
-						<line number="211" hits="0"/>
-						<line number="212" hits="0"/>
-						<line number="215" hits="1"/>
-						<line number="218" hits="0"/>
-						<line number="219" hits="0"/>
-						<line number="221" hits="0"/>
-						<line number="222" hits="0"/>
-						<line number="227" hits="0"/>
-						<line number="230" hits="1"/>
-						<line number="233" hits="0"/>
-						<line number="234" hits="0"/>
-						<line number="238" hits="0"/>
-						<line number="241" hits="0"/>
-						<line number="244" hits="1"/>
-						<line number="245" hits="0"/>
-						<line number="250" hits="1"/>
-						<line number="251" hits="0"/>
-						<line number="261" hits="0"/>
-						<line number="262" hits="0"/>
-						<line number="265" hits="1"/>
-						<line number="266" hits="0"/>
-						<line number="269" hits="0"/>
-						<line number="272" hits="0"/>
-						<line number="273" hits="0"/>
-						<line number="274" hits="0"/>
-						<line number="276" hits="0"/>
-						<line number="277" hits="0"/>
-						<line number="278" hits="0"/>
-						<line number="280" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="extensions/satsdice/lnurl.py" complexity="0" line-rate="0.339" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="130" hits="1"/>
-						<line number="135" hits="1"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="157" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/satsdice/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="45" hits="1"/>
-						<line number="49" hits="0"/>
-						<line number="62" hits="1"/>
-						<line number="66" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/satsdice/models.py" complexity="0" line-rate="0.8681" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="0"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="0"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="0"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="1"/>
-						<line number="130" hits="1"/>
-						<line number="131" hits="1"/>
-						<line number="132" hits="1"/>
-						<line number="133" hits="1"/>
-						<line number="134" hits="1"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="1"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/satsdice/views.py" complexity="0" line-rate="0.434" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="122" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="124" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="130" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/satsdice/views_api.py" complexity="0" line-rate="0.386" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="100" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.satspay" line-rate="0.5413" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/satspay/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/satspay/crud.py" complexity="0" line-rate="0.2692" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/satspay/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="6" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/satspay/models.py" complexity="0" line-rate="0.8085" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="0"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="57" hits="0"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/satspay/tasks.py" complexity="0" line-rate="0.5263" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="0"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/satspay/views.py" complexity="0" line-rate="0.6538" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="40" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/satspay/views_api.py" complexity="0" line-rate="0.4" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="71" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="112" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.scrub" line-rate="0.5172" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/scrub/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/scrub/crud.py" complexity="0" line-rate="0.3438" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="0"/>
-						<line number="11" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="0"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="0"/>
-						<line number="80" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/scrub/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/scrub/models.py" complexity="0" line-rate="0.8" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/scrub/tasks.py" complexity="0" line-rate="0.4" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="81" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/scrub/views.py" complexity="0" line-rate="0.9091" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/scrub/views_api.py" complexity="0" line-rate="0.3846" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="49" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="99" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.splitpayments" line-rate="0.5827" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/splitpayments/__init__.py" complexity="0" line-rate="0.9412" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/splitpayments/crud.py" complexity="0" line-rate="0.4545" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="0"/>
-						<line number="11" hits="0"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="0"/>
-						<line number="16" hits="0"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/splitpayments/migrations.py" complexity="0" line-rate="0.25" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="19" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="54" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/splitpayments/models.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/splitpayments/tasks.py" complexity="0" line-rate="0.4375" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/splitpayments/views.py" complexity="0" line-rate="0.9091" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/splitpayments/views_api.py" complexity="0" line-rate="0.3824" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="0"/>
-						<line number="18" hits="0"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.streamalerts" line-rate="0.4104" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/streamalerts/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/streamalerts/crud.py" complexity="0" line-rate="0.2222" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="0"/>
-						<line number="18" hits="0"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="23" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="39" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="111" hits="1"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="153" hits="1"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="171" hits="1"/>
-						<line number="173" hits="0"/>
-						<line number="176" hits="0"/>
-						<line number="179" hits="1"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="186" hits="0"/>
-						<line number="193" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="200" hits="1"/>
-						<line number="207" hits="0"/>
-						<line number="208" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="213" hits="0"/>
-						<line number="216" hits="1"/>
-						<line number="218" hits="0"/>
-						<line number="219" hits="0"/>
-						<line number="222" hits="0"/>
-						<line number="223" hits="0"/>
-						<line number="226" hits="1"/>
-						<line number="228" hits="0"/>
-						<line number="231" hits="0"/>
-						<line number="234" hits="1"/>
-						<line number="236" hits="0"/>
-						<line number="239" hits="0"/>
-						<line number="242" hits="1"/>
-						<line number="244" hits="0"/>
-						<line number="245" hits="0"/>
-						<line number="248" hits="1"/>
-						<line number="250" hits="0"/>
-						<line number="251" hits="0"/>
-						<line number="255" hits="0"/>
-						<line number="258" hits="0"/>
-						<line number="259" hits="0"/>
-						<line number="262" hits="1"/>
-						<line number="264" hits="0"/>
-						<line number="265" hits="0"/>
-						<line number="269" hits="0"/>
-						<line number="272" hits="0"/>
-						<line number="273" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/streamalerts/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="0"/>
-						<line number="20" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/streamalerts/models.py" complexity="0" line-rate="0.9556" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/streamalerts/views.py" complexity="0" line-rate="0.75" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="34" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/streamalerts/views_api.py" complexity="0" line-rate="0.2869" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="142" hits="1"/>
-						<line number="143" hits="1"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="157" hits="1"/>
-						<line number="158" hits="1"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="162" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="168" hits="1"/>
-						<line number="169" hits="1"/>
-						<line number="173" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="176" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="181" hits="1"/>
-						<line number="182" hits="1"/>
-						<line number="186" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="199" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="208" hits="1"/>
-						<line number="209" hits="1"/>
-						<line number="213" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="216" hits="0"/>
-						<line number="217" hits="0"/>
-						<line number="221" hits="0"/>
-						<line number="222" hits="0"/>
-						<line number="226" hits="0"/>
-						<line number="228" hits="0"/>
-						<line number="231" hits="0"/>
-						<line number="234" hits="1"/>
-						<line number="235" hits="1"/>
-						<line number="237" hits="0"/>
-						<line number="238" hits="0"/>
-						<line number="239" hits="0"/>
-						<line number="242" hits="0"/>
-						<line number="243" hits="0"/>
-						<line number="247" hits="0"/>
-						<line number="248" hits="0"/>
-						<line number="251" hits="1"/>
-						<line number="252" hits="1"/>
-						<line number="254" hits="0"/>
-						<line number="255" hits="0"/>
-						<line number="256" hits="0"/>
-						<line number="259" hits="0"/>
-						<line number="260" hits="0"/>
-						<line number="264" hits="0"/>
-						<line number="265" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.subdomains" line-rate="0.4781" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/subdomains/__init__.py" complexity="0" line-rate="0.9333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="0"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-					</lines>
-				</class>
-				<class name="cloudflare.py" filename="extensions/subdomains/cloudflare.py" complexity="0" line-rate="0.2083" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="13" hits="0"/>
-						<line number="18" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/subdomains/crud.py" complexity="0" line-rate="0.2632" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="0"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="141" hits="1"/>
-						<line number="142" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="148" hits="1"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="160" hits="1"/>
-						<line number="161" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/subdomains/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="0"/>
-						<line number="23" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/subdomains/models.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/subdomains/tasks.py" complexity="0" line-rate="0.4583" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="0"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/subdomains/views.py" complexity="0" line-rate="0.7143" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="0"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="36" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/subdomains/views_api.py" complexity="0" line-rate="0.3023" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="87" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="160" hits="1"/>
-						<line number="161" hits="1"/>
-						<line number="162" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="175" hits="1"/>
-						<line number="176" hits="1"/>
-						<line number="177" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.tipjar" line-rate="0.4979" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/tipjar/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/tipjar/crud.py" complexity="0" line-rate="0.2885" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="14" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="34" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="63" hits="1"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="71" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="77" hits="1"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="85" hits="1"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="91" hits="1"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="97" hits="1"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="103" hits="1"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="114" hits="1"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-					</lines>
-				</class>
-				<class name="helpers.py" filename="extensions/tipjar/helpers.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="0"/>
-						<line number="9" hits="0"/>
-						<line number="10" hits="0"/>
-						<line number="11" hits="0"/>
-						<line number="12" hits="0"/>
-						<line number="20" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/tipjar/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="0"/>
-						<line number="15" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/tipjar/models.py" complexity="0" line-rate="0.96" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/tipjar/views.py" complexity="0" line-rate="0.75" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="0"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="34" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/tipjar/views_api.py" complexity="0" line-rate="0.2979" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="98" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="1"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="136" hits="1"/>
-						<line number="137" hits="1"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="162" hits="1"/>
-						<line number="163" hits="1"/>
-						<line number="167" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="173" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="182" hits="1"/>
-						<line number="183" hits="1"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="200" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.tpos" line-rate="0.568" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/tpos/__init__.py" complexity="0" line-rate="0.9333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="0"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/tpos/crud.py" complexity="0" line-rate="0.381" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="0"/>
-						<line number="11" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/tpos/migrations.py" complexity="0" line-rate="0.5" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="17" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="28" hits="1"/>
-						<line number="32" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/tpos/models.py" complexity="0" line-rate="0.9474" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-					</lines>
-				</class>
-				<class name="tasks.py" filename="extensions/tpos/tasks.py" complexity="0" line-rate="0.4815" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/tpos/views.py" complexity="0" line-rate="0.6667" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="52" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/tpos/views_api.py" complexity="0" line-rate="0.4074" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="59" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="82" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.usermanager" line-rate="0.5796" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/usermanager/__init__.py" complexity="0" line-rate="0.8889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/usermanager/crud.py" complexity="0" line-rate="0.3191" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="78" hits="1"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="0"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/usermanager/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="20" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/usermanager/models.py" complexity="0" line-rate="0.9667" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/usermanager/views.py" complexity="0" line-rate="0.8889" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/usermanager/views_api.py" complexity="0" line-rate="0.5085" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="89" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="105" hits="0"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="112" hits="0"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.watchonly" line-rate="0.3894" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/watchonly/__init__.py" complexity="0" line-rate="0.9091" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/watchonly/crud.py" complexity="0" line-rate="0.2727" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="0"/>
-						<line number="15" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="0"/>
-						<line number="80" hits="1"/>
-						<line number="82" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="115" hits="1"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="161" hits="1"/>
-						<line number="162" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="168" hits="1"/>
-						<line number="171" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="185" hits="1"/>
-						<line number="186" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="197" hits="1"/>
-						<line number="198" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="208" hits="1"/>
-						<line number="209" hits="0"/>
-						<line number="213" hits="1"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="222" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="228" hits="1"/>
-						<line number="229" hits="0"/>
-						<line number="233" hits="0"/>
-						<line number="236" hits="0"/>
-						<line number="239" hits="1"/>
-						<line number="240" hits="0"/>
-						<line number="243" hits="0"/>
-					</lines>
-				</class>
-				<class name="helpers.py" filename="extensions/watchonly/helpers.py" complexity="0" line-rate="0.12" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="0"/>
-						<line number="8" hits="0"/>
-						<line number="9" hits="0"/>
-						<line number="11" hits="0"/>
-						<line number="12" hits="0"/>
-						<line number="15" hits="1"/>
-						<line number="19" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/watchonly/migrations.py" complexity="0" line-rate="0.3333" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="18" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="39" hits="1"/>
-						<line number="44" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="56" hits="1"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="67" hits="1"/>
-						<line number="73" hits="0"/>
-						<line number="81" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="91" hits="1"/>
-						<line number="95" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/watchonly/models.py" complexity="0" line-rate="0.9722" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="0"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="1"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/watchonly/views.py" complexity="0" line-rate="0.9091" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/watchonly/views_api.py" complexity="0" line-rate="0.2203" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="63" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="128" hits="1"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="146" hits="1"/>
-						<line number="147" hits="1"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="152" hits="1"/>
-						<line number="153" hits="1"/>
-						<line number="156" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="181" hits="1"/>
-						<line number="182" hits="1"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="193" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="207" hits="0"/>
-						<line number="208" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="210" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="216" hits="0"/>
-						<line number="217" hits="0"/>
-						<line number="224" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="231" hits="1"/>
-						<line number="232" hits="1"/>
-						<line number="235" hits="0"/>
-						<line number="236" hits="0"/>
-						<line number="239" hits="0"/>
-						<line number="244" hits="0"/>
-						<line number="245" hits="0"/>
-						<line number="246" hits="0"/>
-						<line number="248" hits="0"/>
-						<line number="250" hits="0"/>
-						<line number="251" hits="0"/>
-						<line number="252" hits="0"/>
-						<line number="253" hits="0"/>
-						<line number="254" hits="0"/>
-						<line number="255" hits="0"/>
-						<line number="258" hits="0"/>
-						<line number="265" hits="0"/>
-						<line number="266" hits="0"/>
-						<line number="268" hits="0"/>
-						<line number="269" hits="0"/>
-						<line number="270" hits="0"/>
-						<line number="271" hits="0"/>
-						<line number="273" hits="0"/>
-						<line number="274" hits="0"/>
-						<line number="275" hits="0"/>
-						<line number="276" hits="0"/>
-						<line number="277" hits="0"/>
-						<line number="278" hits="0"/>
-						<line number="279" hits="0"/>
-						<line number="280" hits="0"/>
-						<line number="283" hits="0"/>
-						<line number="285" hits="0"/>
-						<line number="286" hits="0"/>
-						<line number="288" hits="0"/>
-						<line number="290" hits="0"/>
-						<line number="291" hits="0"/>
-						<line number="294" hits="1"/>
-						<line number="295" hits="1"/>
-						<line number="298" hits="0"/>
-						<line number="299" hits="0"/>
-						<line number="300" hits="0"/>
-						<line number="301" hits="0"/>
-						<line number="302" hits="0"/>
-						<line number="304" hits="0"/>
-						<line number="305" hits="0"/>
-						<line number="306" hits="0"/>
-						<line number="307" hits="0"/>
-						<line number="309" hits="0"/>
-						<line number="310" hits="0"/>
-						<line number="317" hits="0"/>
-						<line number="318" hits="0"/>
-						<line number="321" hits="0"/>
-						<line number="322" hits="0"/>
-						<line number="323" hits="0"/>
-						<line number="324" hits="0"/>
-						<line number="327" hits="1"/>
-						<line number="328" hits="1"/>
-						<line number="331" hits="0"/>
-						<line number="332" hits="0"/>
-						<line number="333" hits="0"/>
-						<line number="334" hits="0"/>
-						<line number="338" hits="0"/>
-						<line number="343" hits="0"/>
-						<line number="344" hits="0"/>
-						<line number="345" hits="0"/>
-						<line number="346" hits="0"/>
-						<line number="347" hits="0"/>
-						<line number="349" hits="0"/>
-						<line number="350" hits="0"/>
-						<line number="351" hits="0"/>
-						<line number="357" hits="1"/>
-						<line number="358" hits="1"/>
-						<line number="361" hits="0"/>
-						<line number="362" hits="0"/>
-						<line number="365" hits="1"/>
-						<line number="366" hits="1"/>
-						<line number="367" hits="0"/>
-						<line number="368" hits="0"/>
-						<line number="369" hits="0"/>
-						<line number="370" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="extensions.withdraw" line-rate="0.3743" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="extensions/withdraw/__init__.py" complexity="0" line-rate="0.9167" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-					</lines>
-				</class>
-				<class name="crud.py" filename="extensions/withdraw/crud.py" complexity="0" line-rate="0.2456" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="13" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="56" hits="1"/>
-						<line number="57" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="107" hits="1"/>
-						<line number="108" hits="0"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="116" hits="1"/>
-						<line number="117" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="131" hits="1"/>
-						<line number="132" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="146" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnurl.py" filename="extensions/withdraw/lnurl.py" complexity="0" line-rate="0.2273" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="152" hits="1"/>
-						<line number="157" hits="1"/>
-						<line number="158" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="171" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="173" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="191" hits="0"/>
-					</lines>
-				</class>
-				<class name="migrations.py" filename="extensions/withdraw/migrations.py" complexity="0" line-rate="0.2632" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="5" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="99" hits="1"/>
-						<line number="103" hits="0"/>
-						<line number="113" hits="1"/>
-						<line number="117" hits="0"/>
-						<line number="120" hits="1"/>
-						<line number="124" hits="0"/>
-					</lines>
-				</class>
-				<class name="models.py" filename="extensions/withdraw/models.py" complexity="0" line-rate="0.7925" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="0"/>
-					</lines>
-				</class>
-				<class name="views.py" filename="extensions/withdraw/views.py" complexity="0" line-rate="0.3194" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="119" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="149" hits="0"/>
-					</lines>
-				</class>
-				<class name="views_api.py" filename="extensions/withdraw/views_api.py" complexity="0" line-rate="0.3385" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="116" hits="1"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="134" hits="1"/>
-						<line number="135" hits="1"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="utils" line-rate="0.8644" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="utils/__init__.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines/>
-				</class>
-				<class name="exchange_rates.py" filename="utils/exchange_rates.py" complexity="0" line-rate="0.8644" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="176" hits="1"/>
-						<line number="177" hits="1"/>
-						<line number="178" hits="1"/>
-						<line number="179" hits="1"/>
-						<line number="180" hits="1"/>
-						<line number="183" hits="1"/>
-						<line number="223" hits="1"/>
-						<line number="224" hits="1"/>
-						<line number="230" hits="1"/>
-						<line number="231" hits="1"/>
-						<line number="233" hits="1"/>
-						<line number="235" hits="1"/>
-						<line number="236" hits="1"/>
-						<line number="238" hits="1"/>
-						<line number="239" hits="1"/>
-						<line number="240" hits="1"/>
-						<line number="242" hits="0"/>
-						<line number="244" hits="1"/>
-						<line number="245" hits="1"/>
-						<line number="246" hits="1"/>
-						<line number="247" hits="1"/>
-						<line number="248" hits="1"/>
-						<line number="249" hits="0"/>
-						<line number="250" hits="0"/>
-						<line number="251" hits="0"/>
-						<line number="253" hits="1"/>
-						<line number="254" hits="1"/>
-						<line number="255" hits="1"/>
-						<line number="256" hits="1"/>
-						<line number="257" hits="1"/>
-						<line number="258" hits="1"/>
-						<line number="259" hits="1"/>
-						<line number="260" hits="1"/>
-						<line number="261" hits="1"/>
-						<line number="262" hits="1"/>
-						<line number="270" hits="0"/>
-						<line number="272" hits="1"/>
-						<line number="273" hits="1"/>
-						<line number="274" hits="1"/>
-						<line number="276" hits="1"/>
-						<line number="277" hits="1"/>
-						<line number="278" hits="1"/>
-						<line number="279" hits="1"/>
-						<line number="281" hits="1"/>
-						<line number="282" hits="0"/>
-						<line number="283" hits="1"/>
-						<line number="284" hits="0"/>
-						<line number="286" hits="1"/>
-						<line number="289" hits="1"/>
-						<line number="290" hits="1"/>
-						<line number="293" hits="1"/>
-						<line number="294" hits="1"/>
-						<line number="297" hits="1"/>
-						<line number="298" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="wallets" line-rate="0.2605" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="wallets/__init__.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-					</lines>
-				</class>
-				<class name="base.py" filename="wallets/base.py" complexity="0" line-rate="0.717" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="60" hits="0"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="66" hits="0"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="72" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="0"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-					</lines>
-				</class>
-				<class name="cliche.py" filename="wallets/cliche.py" complexity="0" line-rate="0.1828" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="116" hits="1"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-					</lines>
-				</class>
-				<class name="cln.py" filename="wallets/cln.py" complexity="0" line-rate="0.2212" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="146" hits="1"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="154" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="162" hits="1"/>
-						<line number="164" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="173" hits="0"/>
-					</lines>
-				</class>
-				<class name="eclair.py" filename="wallets/eclair.py" complexity="0" line-rate="0.2202" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="67" hits="1"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="98" hits="1"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="146" hits="1"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="163" hits="1"/>
-						<line number="164" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="171" hits="0"/>
-						<line number="173" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="176" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="181" hits="1"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="193" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-					</lines>
-				</class>
-				<class name="fake.py" filename="wallets/fake.py" complexity="0" line-rate="0.7609" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="79" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="0"/>
-						<line number="96" hits="1"/>
-						<line number="97" hits="0"/>
-						<line number="99" hits="1"/>
-						<line number="100" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnbits.py" filename="wallets/lnbits.py" complexity="0" line-rate="0.1975" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="104" hits="1"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="117" hits="1"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="128" hits="1"/>
-						<line number="129" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="153" hits="0"/>
-					</lines>
-				</class>
-				<class name="lndgrpc.py" filename="wallets/lndgrpc.py" complexity="0" line-rate="0.194" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="0"/>
-						<line number="5" hits="0"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="0"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="0"/>
-						<line number="79" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="119" hits="1"/>
-						<line number="120" hits="0"/>
-						<line number="122" hits="1"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="132" hits="1"/>
-						<line number="138" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="159" hits="1"/>
-						<line number="161" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="171" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="186" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="194" hits="1"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="199" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="206" hits="0"/>
-						<line number="208" hits="0"/>
-						<line number="210" hits="1"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="216" hits="0"/>
-						<line number="217" hits="0"/>
-						<line number="218" hits="0"/>
-						<line number="221" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="226" hits="0"/>
-						<line number="228" hits="0"/>
-						<line number="234" hits="0"/>
-						<line number="240" hits="0"/>
-						<line number="241" hits="0"/>
-						<line number="242" hits="0"/>
-						<line number="243" hits="0"/>
-						<line number="244" hits="0"/>
-						<line number="246" hits="0"/>
-						<line number="248" hits="1"/>
-						<line number="250" hits="0"/>
-						<line number="251" hits="0"/>
-						<line number="252" hits="0"/>
-						<line number="253" hits="0"/>
-						<line number="254" hits="0"/>
-						<line number="256" hits="0"/>
-						<line number="257" hits="0"/>
-						<line number="258" hits="0"/>
-						<line number="259" hits="0"/>
-						<line number="262" hits="0"/>
-					</lines>
-				</class>
-				<class name="lndrest.py" filename="wallets/lndrest.py" complexity="0" line-rate="0.177" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="71" hits="1"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="144" hits="1"/>
-						<line number="148" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="162" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="173" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="183" hits="1"/>
-						<line number="184" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="191" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="193" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="206" hits="0"/>
-					</lines>
-				</class>
-				<class name="lnpay.py" filename="wallets/lnpay.py" complexity="0" line-rate="0.2289" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="0"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="122" hits="1"/>
-						<line number="123" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="128" hits="1"/>
-						<line number="129" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="151" hits="0"/>
-					</lines>
-				</class>
-				<class name="lntxbot.py" filename="wallets/lntxbot.py" complexity="0" line-rate="0.1818" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="1"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="134" hits="1"/>
-						<line number="135" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="152" hits="0"/>
-					</lines>
-				</class>
-				<class name="opennode.py" filename="wallets/opennode.py" complexity="0" line-rate="0.2436" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="52" hits="1"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="100" hits="1"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="129" hits="1"/>
-						<line number="130" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-					</lines>
-				</class>
-				<class name="spark.py" filename="wallets/spark.py" complexity="0" line-rate="0.1667" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="79" hits="1"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="91" hits="1"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="162" hits="1"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="171" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="176" hits="1"/>
-						<line number="178" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="186" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="191" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="193" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="199" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="202" hits="1"/>
-						<line number="203" hits="0"/>
-						<line number="206" hits="0"/>
-						<line number="207" hits="0"/>
-						<line number="208" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="210" hits="0"/>
-						<line number="211" hits="0"/>
-						<line number="212" hits="0"/>
-						<line number="213" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="221" hits="0"/>
-						<line number="223" hits="0"/>
-						<line number="224" hits="0"/>
-					</lines>
-				</class>
-				<class name="void.py" filename="wallets/void.py" complexity="0" line-rate="0.5882" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="0"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="wallets.lnd_grpc_files" line-rate="0" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="wallets/lnd_grpc_files/__init__.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines/>
-				</class>
-				<class name="lightning_pb2.py" filename="wallets/lnd_grpc_files/lightning_pb2.py" complexity="0" line-rate="0" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="4" hits="0"/>
-						<line number="5" hits="0"/>
-						<line number="6" hits="0"/>
-						<line number="7" hits="0"/>
-						<line number="8" hits="0"/>
-						<line number="9" hits="0"/>
-						<line number="10" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="17" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="116" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
-						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="139" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
-						<line number="144" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="146" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="153" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="158" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="162" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="171" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="173" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="176" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="182" hits="0"/>
-						<line number="183" hits="0"/>
-						<line number="184" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="186" hits="0"/>
-						<line number="187" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="191" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="193" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="199" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="206" hits="0"/>
-						<line number="207" hits="0"/>
-						<line number="208" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="210" hits="0"/>
-						<line number="211" hits="0"/>
-						<line number="212" hits="0"/>
-						<line number="213" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="216" hits="0"/>
-						<line number="217" hits="0"/>
-						<line number="218" hits="0"/>
-						<line number="221" hits="0"/>
-						<line number="224" hits="0"/>
-						<line number="227" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="233" hits="0"/>
-						<line number="236" hits="0"/>
-						<line number="237" hits="0"/>
-						<line number="238" hits="0"/>
-						<line number="239" hits="0"/>
-						<line number="240" hits="0"/>
-						<line number="241" hits="0"/>
-						<line number="244" hits="0"/>
-						<line number="245" hits="0"/>
-						<line number="246" hits="0"/>
-						<line number="247" hits="0"/>
-						<line number="248" hits="0"/>
-						<line number="251" hits="0"/>
-						<line number="252" hits="0"/>
-						<line number="253" hits="0"/>
-						<line number="254" hits="0"/>
-						<line number="255" hits="0"/>
-						<line number="256" hits="0"/>
-						<line number="257" hits="0"/>
-						<line number="258" hits="0"/>
-						<line number="259" hits="0"/>
-						<line number="260" hits="0"/>
-						<line number="261" hits="0"/>
-						<line number="262" hits="0"/>
-						<line number="263" hits="0"/>
-						<line number="264" hits="0"/>
-						<line number="265" hits="0"/>
-						<line number="266" hits="0"/>
-						<line number="267" hits="0"/>
-						<line number="268" hits="0"/>
-						<line number="269" hits="0"/>
-						<line number="270" hits="0"/>
-						<line number="273" hits="0"/>
-						<line number="274" hits="0"/>
-						<line number="275" hits="0"/>
-						<line number="276" hits="0"/>
-						<line number="277" hits="0"/>
-						<line number="278" hits="0"/>
-						<line number="279" hits="0"/>
-						<line number="282" hits="0"/>
-						<line number="283" hits="0"/>
-						<line number="284" hits="0"/>
-						<line number="285" hits="0"/>
-						<line number="286" hits="0"/>
-						<line number="287" hits="0"/>
-						<line number="288" hits="0"/>
-						<line number="289" hits="0"/>
-						<line number="290" hits="0"/>
-						<line number="291" hits="0"/>
-						<line number="292" hits="0"/>
-						<line number="293" hits="0"/>
-						<line number="294" hits="0"/>
-						<line number="295" hits="0"/>
-						<line number="298" hits="0"/>
-						<line number="299" hits="0"/>
-						<line number="300" hits="0"/>
-						<line number="301" hits="0"/>
-						<line number="302" hits="0"/>
-						<line number="303" hits="0"/>
-						<line number="304" hits="0"/>
-						<line number="305" hits="0"/>
-						<line number="306" hits="0"/>
-						<line number="307" hits="0"/>
-						<line number="308" hits="0"/>
-						<line number="309" hits="0"/>
-						<line number="310" hits="0"/>
-						<line number="311" hits="0"/>
-						<line number="314" hits="0"/>
-						<line number="315" hits="0"/>
-						<line number="316" hits="0"/>
-						<line number="317" hits="0"/>
-						<line number="318" hits="0"/>
-						<line number="319" hits="0"/>
-						<line number="320" hits="0"/>
-						<line number="321" hits="0"/>
-						<line number="322" hits="0"/>
-						<line number="323" hits="0"/>
-						<line number="324" hits="0"/>
-						<line number="325" hits="0"/>
-						<line number="326" hits="0"/>
-						<line number="327" hits="0"/>
-						<line number="328" hits="0"/>
-						<line number="329" hits="0"/>
-						<line number="330" hits="0"/>
-						<line number="333" hits="0"/>
-						<line number="336" hits="0"/>
-						<line number="337" hits="0"/>
-						<line number="338" hits="0"/>
-						<line number="339" hits="0"/>
-						<line number="340" hits="0"/>
-						<line number="341" hits="0"/>
-						<line number="342" hits="0"/>
-						<line number="343" hits="0"/>
-						<line number="346" hits="0"/>
-						<line number="347" hits="0"/>
-						<line number="348" hits="0"/>
-						<line number="349" hits="0"/>
-						<line number="350" hits="0"/>
-						<line number="351" hits="0"/>
-						<line number="352" hits="0"/>
-						<line number="353" hits="0"/>
-						<line number="354" hits="0"/>
-						<line number="355" hits="0"/>
-						<line number="356" hits="0"/>
-						<line number="357" hits="0"/>
-						<line number="360" hits="0"/>
-						<line number="361" hits="0"/>
-						<line number="362" hits="0"/>
-						<line number="363" hits="0"/>
-						<line number="364" hits="0"/>
-						<line number="365" hits="0"/>
-						<line number="366" hits="0"/>
-						<line number="367" hits="0"/>
-						<line number="368" hits="0"/>
-						<line number="369" hits="0"/>
-						<line number="370" hits="0"/>
-						<line number="371" hits="0"/>
-						<line number="372" hits="0"/>
-						<line number="375" hits="0"/>
-						<line number="376" hits="0"/>
-						<line number="377" hits="0"/>
-						<line number="380" hits="0"/>
-						<line number="381" hits="0"/>
-						<line number="382" hits="0"/>
-						<line number="383" hits="0"/>
-						<line number="384" hits="0"/>
-						<line number="385" hits="0"/>
-						<line number="394" hits="0"/>
-						<line number="396" hits="0"/>
-						<line number="405" hits="0"/>
-						<line number="407" hits="0"/>
-						<line number="416" hits="0"/>
-						<line number="418" hits="0"/>
-						<line number="427" hits="0"/>
-						<line number="429" hits="0"/>
-						<line number="438" hits="0"/>
-						<line number="440" hits="0"/>
-						<line number="449" hits="0"/>
-						<line number="451" hits="0"/>
-						<line number="460" hits="0"/>
-						<line number="462" hits="0"/>
-						<line number="471" hits="0"/>
-						<line number="473" hits="0"/>
-						<line number="482" hits="0"/>
-						<line number="484" hits="0"/>
-						<line number="493" hits="0"/>
-						<line number="495" hits="0"/>
-						<line number="513" hits="0"/>
-						<line number="514" hits="0"/>
-						<line number="516" hits="0"/>
-						<line number="525" hits="0"/>
-						<line number="527" hits="0"/>
-						<line number="536" hits="0"/>
-						<line number="538" hits="0"/>
-						<line number="547" hits="0"/>
-						<line number="549" hits="0"/>
-						<line number="558" hits="0"/>
-						<line number="560" hits="0"/>
-						<line number="569" hits="0"/>
-						<line number="571" hits="0"/>
-						<line number="580" hits="0"/>
-						<line number="582" hits="0"/>
-						<line number="591" hits="0"/>
-						<line number="593" hits="0"/>
-						<line number="602" hits="0"/>
-						<line number="604" hits="0"/>
-						<line number="622" hits="0"/>
-						<line number="623" hits="0"/>
-						<line number="625" hits="0"/>
-						<line number="634" hits="0"/>
-						<line number="636" hits="0"/>
-						<line number="654" hits="0"/>
-						<line number="655" hits="0"/>
-						<line number="657" hits="0"/>
-						<line number="666" hits="0"/>
-						<line number="668" hits="0"/>
-						<line number="677" hits="0"/>
-						<line number="679" hits="0"/>
-						<line number="688" hits="0"/>
-						<line number="690" hits="0"/>
-						<line number="699" hits="0"/>
-						<line number="701" hits="0"/>
-						<line number="710" hits="0"/>
-						<line number="712" hits="0"/>
-						<line number="721" hits="0"/>
-						<line number="723" hits="0"/>
-						<line number="732" hits="0"/>
-						<line number="734" hits="0"/>
-						<line number="743" hits="0"/>
-						<line number="745" hits="0"/>
-						<line number="754" hits="0"/>
-						<line number="756" hits="0"/>
-						<line number="765" hits="0"/>
-						<line number="767" hits="0"/>
-						<line number="776" hits="0"/>
-						<line number="778" hits="0"/>
-						<line number="787" hits="0"/>
-						<line number="789" hits="0"/>
-						<line number="798" hits="0"/>
-						<line number="800" hits="0"/>
-						<line number="809" hits="0"/>
-						<line number="811" hits="0"/>
-						<line number="820" hits="0"/>
-						<line number="822" hits="0"/>
-						<line number="831" hits="0"/>
-						<line number="833" hits="0"/>
-						<line number="842" hits="0"/>
-						<line number="844" hits="0"/>
-						<line number="853" hits="0"/>
-						<line number="855" hits="0"/>
-						<line number="864" hits="0"/>
-						<line number="866" hits="0"/>
-						<line number="875" hits="0"/>
-						<line number="877" hits="0"/>
-						<line number="886" hits="0"/>
-						<line number="888" hits="0"/>
-						<line number="897" hits="0"/>
-						<line number="899" hits="0"/>
-						<line number="908" hits="0"/>
-						<line number="910" hits="0"/>
-						<line number="919" hits="0"/>
-						<line number="921" hits="0"/>
-						<line number="939" hits="0"/>
-						<line number="940" hits="0"/>
-						<line number="942" hits="0"/>
-						<line number="951" hits="0"/>
-						<line number="953" hits="0"/>
-						<line number="962" hits="0"/>
-						<line number="964" hits="0"/>
-						<line number="973" hits="0"/>
-						<line number="975" hits="0"/>
-						<line number="984" hits="0"/>
-						<line number="986" hits="0"/>
-						<line number="995" hits="0"/>
-						<line number="997" hits="0"/>
-						<line number="1006" hits="0"/>
-						<line number="1008" hits="0"/>
-						<line number="1026" hits="0"/>
-						<line number="1027" hits="0"/>
-						<line number="1029" hits="0"/>
-						<line number="1038" hits="0"/>
-						<line number="1040" hits="0"/>
-						<line number="1049" hits="0"/>
-						<line number="1051" hits="0"/>
-						<line number="1060" hits="0"/>
-						<line number="1062" hits="0"/>
-						<line number="1071" hits="0"/>
-						<line number="1073" hits="0"/>
-						<line number="1082" hits="0"/>
-						<line number="1084" hits="0"/>
-						<line number="1093" hits="0"/>
-						<line number="1095" hits="0"/>
-						<line number="1104" hits="0"/>
-						<line number="1106" hits="0"/>
-						<line number="1115" hits="0"/>
-						<line number="1117" hits="0"/>
-						<line number="1126" hits="0"/>
-						<line number="1128" hits="0"/>
-						<line number="1137" hits="0"/>
-						<line number="1139" hits="0"/>
-						<line number="1148" hits="0"/>
-						<line number="1150" hits="0"/>
-						<line number="1159" hits="0"/>
-						<line number="1161" hits="0"/>
-						<line number="1170" hits="0"/>
-						<line number="1172" hits="0"/>
-						<line number="1181" hits="0"/>
-						<line number="1183" hits="0"/>
-						<line number="1192" hits="0"/>
-						<line number="1194" hits="0"/>
-						<line number="1203" hits="0"/>
-						<line number="1205" hits="0"/>
-						<line number="1214" hits="0"/>
-						<line number="1216" hits="0"/>
-						<line number="1225" hits="0"/>
-						<line number="1227" hits="0"/>
-						<line number="1236" hits="0"/>
-						<line number="1238" hits="0"/>
-						<line number="1247" hits="0"/>
-						<line number="1249" hits="0"/>
-						<line number="1258" hits="0"/>
-						<line number="1260" hits="0"/>
-						<line number="1269" hits="0"/>
-						<line number="1271" hits="0"/>
-						<line number="1280" hits="0"/>
-						<line number="1282" hits="0"/>
-						<line number="1291" hits="0"/>
-						<line number="1293" hits="0"/>
-						<line number="1302" hits="0"/>
-						<line number="1304" hits="0"/>
-						<line number="1313" hits="0"/>
-						<line number="1315" hits="0"/>
-						<line number="1324" hits="0"/>
-						<line number="1326" hits="0"/>
-						<line number="1389" hits="0"/>
-						<line number="1390" hits="0"/>
-						<line number="1391" hits="0"/>
-						<line number="1392" hits="0"/>
-						<line number="1393" hits="0"/>
-						<line number="1394" hits="0"/>
-						<line number="1395" hits="0"/>
-						<line number="1397" hits="0"/>
-						<line number="1406" hits="0"/>
-						<line number="1408" hits="0"/>
-						<line number="1417" hits="0"/>
-						<line number="1419" hits="0"/>
-						<line number="1428" hits="0"/>
-						<line number="1430" hits="0"/>
-						<line number="1439" hits="0"/>
-						<line number="1441" hits="0"/>
-						<line number="1459" hits="0"/>
-						<line number="1460" hits="0"/>
-						<line number="1462" hits="0"/>
-						<line number="1471" hits="0"/>
-						<line number="1473" hits="0"/>
-						<line number="1482" hits="0"/>
-						<line number="1484" hits="0"/>
-						<line number="1493" hits="0"/>
-						<line number="1495" hits="0"/>
-						<line number="1513" hits="0"/>
-						<line number="1514" hits="0"/>
-						<line number="1516" hits="0"/>
-						<line number="1525" hits="0"/>
-						<line number="1527" hits="0"/>
-						<line number="1536" hits="0"/>
-						<line number="1538" hits="0"/>
-						<line number="1547" hits="0"/>
-						<line number="1549" hits="0"/>
-						<line number="1567" hits="0"/>
-						<line number="1568" hits="0"/>
-						<line number="1570" hits="0"/>
-						<line number="1579" hits="0"/>
-						<line number="1581" hits="0"/>
-						<line number="1590" hits="0"/>
-						<line number="1592" hits="0"/>
-						<line number="1601" hits="0"/>
-						<line number="1603" hits="0"/>
-						<line number="1612" hits="0"/>
-						<line number="1614" hits="0"/>
-						<line number="1623" hits="0"/>
-						<line number="1625" hits="0"/>
-						<line number="1643" hits="0"/>
-						<line number="1644" hits="0"/>
-						<line number="1646" hits="0"/>
-						<line number="1655" hits="0"/>
-						<line number="1657" hits="0"/>
-						<line number="1666" hits="0"/>
-						<line number="1668" hits="0"/>
-						<line number="1677" hits="0"/>
-						<line number="1679" hits="0"/>
-						<line number="1688" hits="0"/>
-						<line number="1690" hits="0"/>
-						<line number="1699" hits="0"/>
-						<line number="1701" hits="0"/>
-						<line number="1710" hits="0"/>
-						<line number="1712" hits="0"/>
-						<line number="1730" hits="0"/>
-						<line number="1731" hits="0"/>
-						<line number="1733" hits="0"/>
-						<line number="1742" hits="0"/>
-						<line number="1744" hits="0"/>
-						<line number="1753" hits="0"/>
-						<line number="1755" hits="0"/>
-						<line number="1764" hits="0"/>
-						<line number="1766" hits="0"/>
-						<line number="1775" hits="0"/>
-						<line number="1777" hits="0"/>
-						<line number="1786" hits="0"/>
-						<line number="1788" hits="0"/>
-						<line number="1797" hits="0"/>
-						<line number="1799" hits="0"/>
-						<line number="1808" hits="0"/>
-						<line number="1810" hits="0"/>
-						<line number="1819" hits="0"/>
-						<line number="1821" hits="0"/>
-						<line number="1839" hits="0"/>
-						<line number="1840" hits="0"/>
-						<line number="1842" hits="0"/>
-						<line number="1851" hits="0"/>
-						<line number="1853" hits="0"/>
-						<line number="1862" hits="0"/>
-						<line number="1864" hits="0"/>
-						<line number="1873" hits="0"/>
-						<line number="1875" hits="0"/>
-						<line number="1884" hits="0"/>
-						<line number="1886" hits="0"/>
-						<line number="1895" hits="0"/>
-						<line number="1897" hits="0"/>
-						<line number="1906" hits="0"/>
-						<line number="1908" hits="0"/>
-						<line number="1935" hits="0"/>
-						<line number="1936" hits="0"/>
-						<line number="1937" hits="0"/>
-						<line number="1939" hits="0"/>
-						<line number="1957" hits="0"/>
-						<line number="1958" hits="0"/>
-						<line number="1960" hits="0"/>
-						<line number="1969" hits="0"/>
-						<line number="1971" hits="0"/>
-						<line number="1980" hits="0"/>
-						<line number="1982" hits="0"/>
-						<line number="1991" hits="0"/>
-						<line number="1993" hits="0"/>
-						<line number="2002" hits="0"/>
-						<line number="2004" hits="0"/>
-						<line number="2013" hits="0"/>
-						<line number="2015" hits="0"/>
-						<line number="2024" hits="0"/>
-						<line number="2026" hits="0"/>
-						<line number="2035" hits="0"/>
-						<line number="2037" hits="0"/>
-						<line number="2046" hits="0"/>
-						<line number="2048" hits="0"/>
-						<line number="2057" hits="0"/>
-						<line number="2059" hits="0"/>
-						<line number="2068" hits="0"/>
-						<line number="2070" hits="0"/>
-						<line number="2079" hits="0"/>
-						<line number="2081" hits="0"/>
-						<line number="2090" hits="0"/>
-						<line number="2092" hits="0"/>
-						<line number="2101" hits="0"/>
-						<line number="2103" hits="0"/>
-						<line number="2112" hits="0"/>
-						<line number="2114" hits="0"/>
-						<line number="2123" hits="0"/>
-						<line number="2125" hits="0"/>
-						<line number="2134" hits="0"/>
-						<line number="2136" hits="0"/>
-						<line number="2145" hits="0"/>
-						<line number="2147" hits="0"/>
-						<line number="2156" hits="0"/>
-						<line number="2158" hits="0"/>
-						<line number="2167" hits="0"/>
-						<line number="2169" hits="0"/>
-						<line number="2187" hits="0"/>
-						<line number="2188" hits="0"/>
-						<line number="2190" hits="0"/>
-						<line number="2199" hits="0"/>
-						<line number="2201" hits="0"/>
-						<line number="2210" hits="0"/>
-						<line number="2212" hits="0"/>
-						<line number="2221" hits="0"/>
-						<line number="2223" hits="0"/>
-						<line number="2232" hits="0"/>
-						<line number="2234" hits="0"/>
-						<line number="2243" hits="0"/>
-						<line number="2245" hits="0"/>
-						<line number="2254" hits="0"/>
-						<line number="2256" hits="0"/>
-						<line number="2265" hits="0"/>
-						<line number="2267" hits="0"/>
-						<line number="2276" hits="0"/>
-						<line number="2278" hits="0"/>
-						<line number="2287" hits="0"/>
-						<line number="2289" hits="0"/>
-						<line number="2298" hits="0"/>
-						<line number="2300" hits="0"/>
-						<line number="2309" hits="0"/>
-						<line number="2311" hits="0"/>
-						<line number="2320" hits="0"/>
-						<line number="2322" hits="0"/>
-						<line number="2331" hits="0"/>
-						<line number="2333" hits="0"/>
-						<line number="2342" hits="0"/>
-						<line number="2344" hits="0"/>
-						<line number="2353" hits="0"/>
-						<line number="2355" hits="0"/>
-						<line number="2364" hits="0"/>
-						<line number="2366" hits="0"/>
-						<line number="2375" hits="0"/>
-						<line number="2377" hits="0"/>
-						<line number="2386" hits="0"/>
-						<line number="2388" hits="0"/>
-						<line number="2397" hits="0"/>
-						<line number="2399" hits="0"/>
-						<line number="2408" hits="0"/>
-						<line number="2410" hits="0"/>
-						<line number="2419" hits="0"/>
-						<line number="2421" hits="0"/>
-						<line number="2430" hits="0"/>
-						<line number="2432" hits="0"/>
-						<line number="2441" hits="0"/>
-						<line number="2443" hits="0"/>
-						<line number="2452" hits="0"/>
-						<line number="2454" hits="0"/>
-						<line number="2463" hits="0"/>
-						<line number="2465" hits="0"/>
-						<line number="2474" hits="0"/>
-						<line number="2476" hits="0"/>
-						<line number="2485" hits="0"/>
-						<line number="2487" hits="0"/>
-						<line number="2496" hits="0"/>
-						<line number="2498" hits="0"/>
-						<line number="2507" hits="0"/>
-						<line number="2509" hits="0"/>
-						<line number="2527" hits="0"/>
-						<line number="2528" hits="0"/>
-						<line number="2530" hits="0"/>
-						<line number="2539" hits="0"/>
-						<line number="2541" hits="0"/>
-						<line number="2550" hits="0"/>
-						<line number="2552" hits="0"/>
-						<line number="2561" hits="0"/>
-						<line number="2563" hits="0"/>
-						<line number="2572" hits="0"/>
-						<line number="2574" hits="0"/>
-						<line number="2583" hits="0"/>
-						<line number="2585" hits="0"/>
-						<line number="2594" hits="0"/>
-						<line number="2596" hits="0"/>
-						<line number="2605" hits="0"/>
-						<line number="2607" hits="0"/>
-						<line number="2616" hits="0"/>
-						<line number="2618" hits="0"/>
-						<line number="2627" hits="0"/>
-						<line number="2629" hits="0"/>
-						<line number="2638" hits="0"/>
-						<line number="2640" hits="0"/>
-						<line number="2649" hits="0"/>
-						<line number="2651" hits="0"/>
-						<line number="2660" hits="0"/>
-						<line number="2662" hits="0"/>
-						<line number="2663" hits="0"/>
-						<line number="2665" hits="0"/>
-						<line number="2666" hits="0"/>
-						<line number="2667" hits="0"/>
-						<line number="2668" hits="0"/>
-						<line number="2669" hits="0"/>
-						<line number="2670" hits="0"/>
-						<line number="2671" hits="0"/>
-						<line number="2672" hits="0"/>
-						<line number="2673" hits="0"/>
-						<line number="2674" hits="0"/>
-						<line number="2675" hits="0"/>
-						<line number="2676" hits="0"/>
-						<line number="2677" hits="0"/>
-						<line number="2678" hits="0"/>
-						<line number="2681" hits="0"/>
-						<line number="2682" hits="0"/>
-						<line number="2683" hits="0"/>
-						<line number="2684" hits="0"/>
-						<line number="2687" hits="0"/>
-						<line number="2688" hits="0"/>
-						<line number="2689" hits="0"/>
-						<line number="2690" hits="0"/>
-						<line number="2691" hits="0"/>
-						<line number="2692" hits="0"/>
-						<line number="2693" hits="0"/>
-						<line number="2694" hits="0"/>
-						<line number="2695" hits="0"/>
-						<line number="2696" hits="0"/>
-						<line number="2697" hits="0"/>
-						<line number="2698" hits="0"/>
-						<line number="2699" hits="0"/>
-						<line number="2700" hits="0"/>
-						<line number="2701" hits="0"/>
-						<line number="2702" hits="0"/>
-						<line number="2703" hits="0"/>
-						<line number="2704" hits="0"/>
-						<line number="2705" hits="0"/>
-						<line number="2706" hits="0"/>
-						<line number="2707" hits="0"/>
-						<line number="2708" hits="0"/>
-						<line number="2709" hits="0"/>
-						<line number="2710" hits="0"/>
-						<line number="2711" hits="0"/>
-						<line number="2712" hits="0"/>
-						<line number="2715" hits="0"/>
-						<line number="2716" hits="0"/>
-						<line number="2719" hits="0"/>
-						<line number="2720" hits="0"/>
-						<line number="2721" hits="0"/>
-						<line number="2722" hits="0"/>
-						<line number="2725" hits="0"/>
-						<line number="2726" hits="0"/>
-						<line number="2727" hits="0"/>
-						<line number="2728" hits="0"/>
-						<line number="2729" hits="0"/>
-						<line number="2730" hits="0"/>
-						<line number="2733" hits="0"/>
-						<line number="2734" hits="0"/>
-						<line number="2735" hits="0"/>
-						<line number="2736" hits="0"/>
-						<line number="2739" hits="0"/>
-						<line number="2740" hits="0"/>
-						<line number="2743" hits="0"/>
-						<line number="2744" hits="0"/>
-						<line number="2745" hits="0"/>
-						<line number="2746" hits="0"/>
-						<line number="2747" hits="0"/>
-						<line number="2748" hits="0"/>
-						<line number="2749" hits="0"/>
-						<line number="2750" hits="0"/>
-						<line number="2751" hits="0"/>
-						<line number="2752" hits="0"/>
-						<line number="2753" hits="0"/>
-						<line number="2754" hits="0"/>
-						<line number="2755" hits="0"/>
-						<line number="2756" hits="0"/>
-						<line number="2757" hits="0"/>
-						<line number="2758" hits="0"/>
-						<line number="2759" hits="0"/>
-						<line number="2760" hits="0"/>
-						<line number="2761" hits="0"/>
-						<line number="2762" hits="0"/>
-						<line number="2763" hits="0"/>
-						<line number="2764" hits="0"/>
-						<line number="2765" hits="0"/>
-						<line number="2766" hits="0"/>
-						<line number="2767" hits="0"/>
-						<line number="2768" hits="0"/>
-						<line number="2769" hits="0"/>
-						<line number="2770" hits="0"/>
-						<line number="2771" hits="0"/>
-						<line number="2772" hits="0"/>
-						<line number="2773" hits="0"/>
-						<line number="2774" hits="0"/>
-						<line number="2775" hits="0"/>
-						<line number="2776" hits="0"/>
-						<line number="2777" hits="0"/>
-						<line number="2778" hits="0"/>
-						<line number="2779" hits="0"/>
-						<line number="2780" hits="0"/>
-						<line number="2781" hits="0"/>
-						<line number="2782" hits="0"/>
-						<line number="2783" hits="0"/>
-						<line number="2784" hits="0"/>
-						<line number="2785" hits="0"/>
-						<line number="2786" hits="0"/>
-						<line number="2787" hits="0"/>
-						<line number="2788" hits="0"/>
-						<line number="2789" hits="0"/>
-						<line number="2790" hits="0"/>
-						<line number="2791" hits="0"/>
-						<line number="2792" hits="0"/>
-						<line number="2793" hits="0"/>
-						<line number="2794" hits="0"/>
-						<line number="2795" hits="0"/>
-						<line number="2796" hits="0"/>
-						<line number="2797" hits="0"/>
-						<line number="2798" hits="0"/>
-						<line number="2799" hits="0"/>
-						<line number="2800" hits="0"/>
-						<line number="2801" hits="0"/>
-						<line number="2802" hits="0"/>
-						<line number="2803" hits="0"/>
-						<line number="2804" hits="0"/>
-						<line number="2805" hits="0"/>
-						<line number="2806" hits="0"/>
-						<line number="2807" hits="0"/>
-						<line number="2808" hits="0"/>
-						<line number="2809" hits="0"/>
-						<line number="2810" hits="0"/>
-						<line number="2811" hits="0"/>
-						<line number="2812" hits="0"/>
-						<line number="2813" hits="0"/>
-						<line number="2814" hits="0"/>
-						<line number="2815" hits="0"/>
-						<line number="2816" hits="0"/>
-						<line number="2817" hits="0"/>
-						<line number="2818" hits="0"/>
-						<line number="2819" hits="0"/>
-						<line number="2820" hits="0"/>
-						<line number="2821" hits="0"/>
-						<line number="2822" hits="0"/>
-						<line number="2823" hits="0"/>
-						<line number="2824" hits="0"/>
-						<line number="2825" hits="0"/>
-						<line number="2826" hits="0"/>
-						<line number="2827" hits="0"/>
-						<line number="2828" hits="0"/>
-						<line number="2829" hits="0"/>
-						<line number="2830" hits="0"/>
-						<line number="2831" hits="0"/>
-						<line number="2832" hits="0"/>
-						<line number="2833" hits="0"/>
-						<line number="2834" hits="0"/>
-						<line number="2835" hits="0"/>
-						<line number="2836" hits="0"/>
-						<line number="2837" hits="0"/>
-						<line number="2838" hits="0"/>
-						<line number="2839" hits="0"/>
-						<line number="2840" hits="0"/>
-						<line number="2841" hits="0"/>
-						<line number="2842" hits="0"/>
-						<line number="2843" hits="0"/>
-						<line number="2844" hits="0"/>
-						<line number="2845" hits="0"/>
-						<line number="2846" hits="0"/>
-						<line number="2847" hits="0"/>
-						<line number="2848" hits="0"/>
-						<line number="2849" hits="0"/>
-						<line number="2850" hits="0"/>
-						<line number="2851" hits="0"/>
-						<line number="2852" hits="0"/>
-						<line number="2853" hits="0"/>
-						<line number="2854" hits="0"/>
-						<line number="2855" hits="0"/>
-						<line number="2856" hits="0"/>
-						<line number="2857" hits="0"/>
-						<line number="2858" hits="0"/>
-						<line number="2859" hits="0"/>
-						<line number="2860" hits="0"/>
-						<line number="2861" hits="0"/>
-						<line number="2862" hits="0"/>
-						<line number="2863" hits="0"/>
-						<line number="2864" hits="0"/>
-						<line number="2865" hits="0"/>
-						<line number="2866" hits="0"/>
-						<line number="2867" hits="0"/>
-						<line number="2868" hits="0"/>
-						<line number="2869" hits="0"/>
-						<line number="2870" hits="0"/>
-						<line number="2871" hits="0"/>
-						<line number="2872" hits="0"/>
-						<line number="2873" hits="0"/>
-						<line number="2874" hits="0"/>
-						<line number="2875" hits="0"/>
-						<line number="2876" hits="0"/>
-						<line number="2877" hits="0"/>
-						<line number="2878" hits="0"/>
-						<line number="2879" hits="0"/>
-						<line number="2880" hits="0"/>
-						<line number="2881" hits="0"/>
-						<line number="2882" hits="0"/>
-						<line number="2883" hits="0"/>
-						<line number="2884" hits="0"/>
-						<line number="2885" hits="0"/>
-						<line number="2886" hits="0"/>
-						<line number="2887" hits="0"/>
-						<line number="2888" hits="0"/>
-						<line number="2889" hits="0"/>
-						<line number="2890" hits="0"/>
-						<line number="2891" hits="0"/>
-						<line number="2892" hits="0"/>
-						<line number="2893" hits="0"/>
-						<line number="2894" hits="0"/>
-						<line number="2895" hits="0"/>
-						<line number="2896" hits="0"/>
-						<line number="2897" hits="0"/>
-						<line number="2898" hits="0"/>
-						<line number="2899" hits="0"/>
-						<line number="2900" hits="0"/>
-						<line number="2901" hits="0"/>
-						<line number="2902" hits="0"/>
-						<line number="2903" hits="0"/>
-						<line number="2904" hits="0"/>
-						<line number="2905" hits="0"/>
-						<line number="2906" hits="0"/>
-						<line number="2907" hits="0"/>
-						<line number="2908" hits="0"/>
-						<line number="2909" hits="0"/>
-						<line number="2910" hits="0"/>
-						<line number="2911" hits="0"/>
-						<line number="2912" hits="0"/>
-						<line number="2913" hits="0"/>
-						<line number="2914" hits="0"/>
-						<line number="2915" hits="0"/>
-						<line number="2916" hits="0"/>
-						<line number="2917" hits="0"/>
-						<line number="2918" hits="0"/>
-						<line number="2919" hits="0"/>
-						<line number="2920" hits="0"/>
-						<line number="2921" hits="0"/>
-						<line number="2922" hits="0"/>
-						<line number="2923" hits="0"/>
-						<line number="2924" hits="0"/>
-						<line number="2925" hits="0"/>
-						<line number="2926" hits="0"/>
-						<line number="2927" hits="0"/>
-						<line number="2928" hits="0"/>
-						<line number="2929" hits="0"/>
-						<line number="2930" hits="0"/>
-						<line number="2931" hits="0"/>
-						<line number="2932" hits="0"/>
-						<line number="2933" hits="0"/>
-						<line number="2934" hits="0"/>
-						<line number="2935" hits="0"/>
-						<line number="2936" hits="0"/>
-						<line number="2937" hits="0"/>
-						<line number="2938" hits="0"/>
-						<line number="2939" hits="0"/>
-						<line number="2940" hits="0"/>
-						<line number="2941" hits="0"/>
-						<line number="2942" hits="0"/>
-						<line number="2943" hits="0"/>
-						<line number="2944" hits="0"/>
-						<line number="2945" hits="0"/>
-						<line number="2946" hits="0"/>
-						<line number="2947" hits="0"/>
-						<line number="2948" hits="0"/>
-						<line number="2949" hits="0"/>
-						<line number="2950" hits="0"/>
-						<line number="2951" hits="0"/>
-						<line number="2952" hits="0"/>
-						<line number="2953" hits="0"/>
-						<line number="2954" hits="0"/>
-						<line number="2955" hits="0"/>
-						<line number="2956" hits="0"/>
-						<line number="2957" hits="0"/>
-						<line number="2958" hits="0"/>
-						<line number="2959" hits="0"/>
-						<line number="2960" hits="0"/>
-						<line number="2961" hits="0"/>
-						<line number="2962" hits="0"/>
-						<line number="2963" hits="0"/>
-						<line number="2964" hits="0"/>
-						<line number="2965" hits="0"/>
-						<line number="2966" hits="0"/>
-						<line number="2967" hits="0"/>
-						<line number="2968" hits="0"/>
-						<line number="2969" hits="0"/>
-						<line number="2970" hits="0"/>
-						<line number="2971" hits="0"/>
-						<line number="2972" hits="0"/>
-						<line number="2973" hits="0"/>
-						<line number="2974" hits="0"/>
-						<line number="2975" hits="0"/>
-						<line number="2976" hits="0"/>
-						<line number="2977" hits="0"/>
-						<line number="2978" hits="0"/>
-						<line number="2979" hits="0"/>
-						<line number="2980" hits="0"/>
-						<line number="2981" hits="0"/>
-						<line number="2982" hits="0"/>
-						<line number="2983" hits="0"/>
-						<line number="2984" hits="0"/>
-						<line number="2985" hits="0"/>
-						<line number="2986" hits="0"/>
-						<line number="2987" hits="0"/>
-						<line number="2988" hits="0"/>
-						<line number="2989" hits="0"/>
-						<line number="2990" hits="0"/>
-						<line number="2991" hits="0"/>
-						<line number="2992" hits="0"/>
-						<line number="2993" hits="0"/>
-						<line number="2994" hits="0"/>
-						<line number="2995" hits="0"/>
-						<line number="2996" hits="0"/>
-						<line number="2997" hits="0"/>
-						<line number="2998" hits="0"/>
-						<line number="2999" hits="0"/>
-						<line number="3000" hits="0"/>
-						<line number="3001" hits="0"/>
-						<line number="3002" hits="0"/>
-						<line number="3003" hits="0"/>
-						<line number="3004" hits="0"/>
-						<line number="3005" hits="0"/>
-						<line number="3006" hits="0"/>
-						<line number="3007" hits="0"/>
-						<line number="3008" hits="0"/>
-						<line number="3009" hits="0"/>
-						<line number="3010" hits="0"/>
-						<line number="3011" hits="0"/>
-						<line number="3012" hits="0"/>
-						<line number="3013" hits="0"/>
-						<line number="3014" hits="0"/>
-						<line number="3015" hits="0"/>
-						<line number="3016" hits="0"/>
-						<line number="3017" hits="0"/>
-						<line number="3018" hits="0"/>
-						<line number="3019" hits="0"/>
-						<line number="3020" hits="0"/>
-						<line number="3021" hits="0"/>
-						<line number="3022" hits="0"/>
-						<line number="3023" hits="0"/>
-						<line number="3024" hits="0"/>
-						<line number="3025" hits="0"/>
-						<line number="3026" hits="0"/>
-						<line number="3027" hits="0"/>
-						<line number="3028" hits="0"/>
-						<line number="3029" hits="0"/>
-						<line number="3030" hits="0"/>
-						<line number="3031" hits="0"/>
-						<line number="3032" hits="0"/>
-						<line number="3033" hits="0"/>
-						<line number="3034" hits="0"/>
-						<line number="3035" hits="0"/>
-						<line number="3036" hits="0"/>
-						<line number="3037" hits="0"/>
-						<line number="3038" hits="0"/>
-						<line number="3039" hits="0"/>
-						<line number="3040" hits="0"/>
-						<line number="3041" hits="0"/>
-						<line number="3042" hits="0"/>
-						<line number="3043" hits="0"/>
-						<line number="3044" hits="0"/>
-						<line number="3045" hits="0"/>
-						<line number="3046" hits="0"/>
-						<line number="3047" hits="0"/>
-						<line number="3048" hits="0"/>
-						<line number="3049" hits="0"/>
-						<line number="3050" hits="0"/>
-						<line number="3051" hits="0"/>
-						<line number="3052" hits="0"/>
-						<line number="3053" hits="0"/>
-						<line number="3054" hits="0"/>
-						<line number="3055" hits="0"/>
-						<line number="3056" hits="0"/>
-						<line number="3057" hits="0"/>
-						<line number="3058" hits="0"/>
-						<line number="3059" hits="0"/>
-						<line number="3060" hits="0"/>
-						<line number="3061" hits="0"/>
-						<line number="3062" hits="0"/>
-						<line number="3063" hits="0"/>
-						<line number="3064" hits="0"/>
-						<line number="3065" hits="0"/>
-						<line number="3066" hits="0"/>
-						<line number="3067" hits="0"/>
-						<line number="3068" hits="0"/>
-						<line number="3069" hits="0"/>
-						<line number="3070" hits="0"/>
-						<line number="3071" hits="0"/>
-						<line number="3072" hits="0"/>
-						<line number="3073" hits="0"/>
-						<line number="3074" hits="0"/>
-						<line number="3075" hits="0"/>
-						<line number="3076" hits="0"/>
-						<line number="3077" hits="0"/>
-						<line number="3078" hits="0"/>
-						<line number="3079" hits="0"/>
-						<line number="3080" hits="0"/>
-						<line number="3081" hits="0"/>
-						<line number="3082" hits="0"/>
-						<line number="3083" hits="0"/>
-						<line number="3084" hits="0"/>
-						<line number="3085" hits="0"/>
-						<line number="3086" hits="0"/>
-						<line number="3087" hits="0"/>
-						<line number="3088" hits="0"/>
-						<line number="3089" hits="0"/>
-						<line number="3090" hits="0"/>
-						<line number="3091" hits="0"/>
-						<line number="3092" hits="0"/>
-						<line number="3093" hits="0"/>
-						<line number="3094" hits="0"/>
-						<line number="3095" hits="0"/>
-						<line number="3096" hits="0"/>
-						<line number="3097" hits="0"/>
-						<line number="3098" hits="0"/>
-						<line number="3099" hits="0"/>
-						<line number="3100" hits="0"/>
-						<line number="3101" hits="0"/>
-						<line number="3102" hits="0"/>
-						<line number="3103" hits="0"/>
-						<line number="3104" hits="0"/>
-						<line number="3105" hits="0"/>
-						<line number="3106" hits="0"/>
-						<line number="3107" hits="0"/>
-						<line number="3108" hits="0"/>
-						<line number="3109" hits="0"/>
-						<line number="3110" hits="0"/>
-						<line number="3111" hits="0"/>
-						<line number="3112" hits="0"/>
-						<line number="3113" hits="0"/>
-						<line number="3114" hits="0"/>
-						<line number="3115" hits="0"/>
-						<line number="3116" hits="0"/>
-						<line number="3117" hits="0"/>
-						<line number="3118" hits="0"/>
-						<line number="3119" hits="0"/>
-						<line number="3120" hits="0"/>
-						<line number="3121" hits="0"/>
-						<line number="3122" hits="0"/>
-						<line number="3123" hits="0"/>
-						<line number="3124" hits="0"/>
-						<line number="3125" hits="0"/>
-						<line number="3126" hits="0"/>
-						<line number="3127" hits="0"/>
-						<line number="3128" hits="0"/>
-						<line number="3129" hits="0"/>
-						<line number="3130" hits="0"/>
-						<line number="3131" hits="0"/>
-						<line number="3132" hits="0"/>
-						<line number="3133" hits="0"/>
-						<line number="3134" hits="0"/>
-						<line number="3135" hits="0"/>
-						<line number="3136" hits="0"/>
-						<line number="3137" hits="0"/>
-						<line number="3138" hits="0"/>
-						<line number="3139" hits="0"/>
-						<line number="3140" hits="0"/>
-						<line number="3141" hits="0"/>
-						<line number="3142" hits="0"/>
-						<line number="3143" hits="0"/>
-						<line number="3144" hits="0"/>
-						<line number="3145" hits="0"/>
-						<line number="3146" hits="0"/>
-						<line number="3147" hits="0"/>
-						<line number="3148" hits="0"/>
-						<line number="3149" hits="0"/>
-						<line number="3150" hits="0"/>
-						<line number="3151" hits="0"/>
-						<line number="3152" hits="0"/>
-						<line number="3153" hits="0"/>
-						<line number="3154" hits="0"/>
-						<line number="3155" hits="0"/>
-						<line number="3156" hits="0"/>
-						<line number="3157" hits="0"/>
-						<line number="3158" hits="0"/>
-						<line number="3159" hits="0"/>
-						<line number="3160" hits="0"/>
-						<line number="3161" hits="0"/>
-						<line number="3162" hits="0"/>
-						<line number="3163" hits="0"/>
-						<line number="3164" hits="0"/>
-						<line number="3165" hits="0"/>
-						<line number="3166" hits="0"/>
-						<line number="3167" hits="0"/>
-						<line number="3168" hits="0"/>
-						<line number="3169" hits="0"/>
-						<line number="3170" hits="0"/>
-						<line number="3171" hits="0"/>
-						<line number="3172" hits="0"/>
-						<line number="3173" hits="0"/>
-						<line number="3174" hits="0"/>
-						<line number="3175" hits="0"/>
-						<line number="3176" hits="0"/>
-						<line number="3177" hits="0"/>
-						<line number="3178" hits="0"/>
-						<line number="3179" hits="0"/>
-						<line number="3180" hits="0"/>
-						<line number="3181" hits="0"/>
-						<line number="3182" hits="0"/>
-						<line number="3183" hits="0"/>
-						<line number="3184" hits="0"/>
-						<line number="3185" hits="0"/>
-						<line number="3186" hits="0"/>
-						<line number="3187" hits="0"/>
-						<line number="3188" hits="0"/>
-						<line number="3189" hits="0"/>
-						<line number="3190" hits="0"/>
-						<line number="3191" hits="0"/>
-						<line number="3192" hits="0"/>
-						<line number="3193" hits="0"/>
-						<line number="3194" hits="0"/>
-						<line number="3195" hits="0"/>
-						<line number="3196" hits="0"/>
-						<line number="3197" hits="0"/>
-						<line number="3198" hits="0"/>
-						<line number="3199" hits="0"/>
-						<line number="3200" hits="0"/>
-						<line number="3201" hits="0"/>
-						<line number="3202" hits="0"/>
-						<line number="3203" hits="0"/>
-						<line number="3204" hits="0"/>
-						<line number="3205" hits="0"/>
-						<line number="3206" hits="0"/>
-						<line number="3207" hits="0"/>
-						<line number="3208" hits="0"/>
-						<line number="3209" hits="0"/>
-						<line number="3210" hits="0"/>
-						<line number="3211" hits="0"/>
-						<line number="3212" hits="0"/>
-						<line number="3213" hits="0"/>
-						<line number="3214" hits="0"/>
-						<line number="3215" hits="0"/>
-						<line number="3216" hits="0"/>
-						<line number="3217" hits="0"/>
-						<line number="3218" hits="0"/>
-						<line number="3219" hits="0"/>
-						<line number="3220" hits="0"/>
-						<line number="3221" hits="0"/>
-						<line number="3222" hits="0"/>
-						<line number="3223" hits="0"/>
-						<line number="3224" hits="0"/>
-						<line number="3225" hits="0"/>
-						<line number="3226" hits="0"/>
-						<line number="3227" hits="0"/>
-						<line number="3228" hits="0"/>
-						<line number="3229" hits="0"/>
-						<line number="3230" hits="0"/>
-						<line number="3231" hits="0"/>
-						<line number="3232" hits="0"/>
-						<line number="3233" hits="0"/>
-						<line number="3234" hits="0"/>
-						<line number="3235" hits="0"/>
-						<line number="3236" hits="0"/>
-						<line number="3237" hits="0"/>
-						<line number="3238" hits="0"/>
-						<line number="3239" hits="0"/>
-						<line number="3240" hits="0"/>
-						<line number="3241" hits="0"/>
-						<line number="3242" hits="0"/>
-						<line number="3243" hits="0"/>
-						<line number="3244" hits="0"/>
-						<line number="3245" hits="0"/>
-						<line number="3246" hits="0"/>
-						<line number="3247" hits="0"/>
-						<line number="3248" hits="0"/>
-						<line number="3249" hits="0"/>
-						<line number="3250" hits="0"/>
-						<line number="3251" hits="0"/>
-						<line number="3252" hits="0"/>
-						<line number="3253" hits="0"/>
-						<line number="3254" hits="0"/>
-						<line number="3255" hits="0"/>
-						<line number="3256" hits="0"/>
-						<line number="3257" hits="0"/>
-						<line number="3258" hits="0"/>
-						<line number="3259" hits="0"/>
-						<line number="3260" hits="0"/>
-						<line number="3261" hits="0"/>
-						<line number="3262" hits="0"/>
-						<line number="3263" hits="0"/>
-						<line number="3264" hits="0"/>
-						<line number="3265" hits="0"/>
-						<line number="3266" hits="0"/>
-						<line number="3267" hits="0"/>
-						<line number="3268" hits="0"/>
-						<line number="3269" hits="0"/>
-						<line number="3270" hits="0"/>
-						<line number="3271" hits="0"/>
-						<line number="3272" hits="0"/>
-						<line number="3273" hits="0"/>
-						<line number="3274" hits="0"/>
-						<line number="3275" hits="0"/>
-						<line number="3276" hits="0"/>
-						<line number="3277" hits="0"/>
-						<line number="3278" hits="0"/>
-						<line number="3279" hits="0"/>
-						<line number="3280" hits="0"/>
-					</lines>
-				</class>
-				<class name="lightning_pb2_grpc.py" filename="wallets/lnd_grpc_files/lightning_pb2_grpc.py" complexity="0" line-rate="0" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="2" hits="0"/>
-						<line number="3" hits="0"/>
-						<line number="5" hits="0"/>
-						<line number="8" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="145" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="155" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="185" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="210" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="220" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="235" hits="0"/>
-						<line number="240" hits="0"/>
-						<line number="245" hits="0"/>
-						<line number="250" hits="0"/>
-						<line number="255" hits="0"/>
-						<line number="260" hits="0"/>
-						<line number="265" hits="0"/>
-						<line number="270" hits="0"/>
-						<line number="275" hits="0"/>
-						<line number="280" hits="0"/>
-						<line number="285" hits="0"/>
-						<line number="290" hits="0"/>
-						<line number="295" hits="0"/>
-						<line number="300" hits="0"/>
-						<line number="305" hits="0"/>
-						<line number="310" hits="0"/>
-						<line number="315" hits="0"/>
-						<line number="320" hits="0"/>
-						<line number="325" hits="0"/>
-						<line number="330" hits="0"/>
-						<line number="335" hits="0"/>
-						<line number="340" hits="0"/>
-						<line number="345" hits="0"/>
-						<line number="350" hits="0"/>
-						<line number="355" hits="0"/>
-						<line number="362" hits="0"/>
-						<line number="383" hits="0"/>
-						<line number="389" hits="0"/>
-						<line number="390" hits="0"/>
-						<line number="391" hits="0"/>
-						<line number="393" hits="0"/>
-						<line number="399" hits="0"/>
-						<line number="400" hits="0"/>
-						<line number="401" hits="0"/>
-						<line number="403" hits="0"/>
-						<line number="408" hits="0"/>
-						<line number="409" hits="0"/>
-						<line number="410" hits="0"/>
-						<line number="412" hits="0"/>
-						<line number="422" hits="0"/>
-						<line number="423" hits="0"/>
-						<line number="424" hits="0"/>
-						<line number="426" hits="0"/>
-						<line number="434" hits="0"/>
-						<line number="435" hits="0"/>
-						<line number="436" hits="0"/>
-						<line number="438" hits="0"/>
-						<line number="445" hits="0"/>
-						<line number="446" hits="0"/>
-						<line number="447" hits="0"/>
-						<line number="449" hits="0"/>
-						<line number="455" hits="0"/>
-						<line number="456" hits="0"/>
-						<line number="457" hits="0"/>
-						<line number="459" hits="0"/>
-						<line number="466" hits="0"/>
-						<line number="467" hits="0"/>
-						<line number="468" hits="0"/>
-						<line number="470" hits="0"/>
-						<line number="474" hits="0"/>
-						<line number="475" hits="0"/>
-						<line number="476" hits="0"/>
-						<line number="478" hits="0"/>
-						<line number="484" hits="0"/>
-						<line number="485" hits="0"/>
-						<line number="486" hits="0"/>
-						<line number="488" hits="0"/>
-						<line number="495" hits="0"/>
-						<line number="496" hits="0"/>
-						<line number="497" hits="0"/>
-						<line number="499" hits="0"/>
-						<line number="505" hits="0"/>
-						<line number="506" hits="0"/>
-						<line number="507" hits="0"/>
-						<line number="509" hits="0"/>
-						<line number="515" hits="0"/>
-						<line number="516" hits="0"/>
-						<line number="517" hits="0"/>
-						<line number="519" hits="0"/>
-						<line number="523" hits="0"/>
-						<line number="524" hits="0"/>
-						<line number="525" hits="0"/>
-						<line number="527" hits="0"/>
-						<line number="533" hits="0"/>
-						<line number="534" hits="0"/>
-						<line number="535" hits="0"/>
-						<line number="537" hits="0"/>
-						<line number="543" hits="0"/>
-						<line number="544" hits="0"/>
-						<line number="545" hits="0"/>
-						<line number="547" hits="0"/>
-						<line number="553" hits="0"/>
-						<line number="554" hits="0"/>
-						<line number="555" hits="0"/>
-						<line number="557" hits="0"/>
-						<line number="566" hits="0"/>
-						<line number="567" hits="0"/>
-						<line number="568" hits="0"/>
-						<line number="570" hits="0"/>
-						<line number="575" hits="0"/>
-						<line number="576" hits="0"/>
-						<line number="577" hits="0"/>
-						<line number="579" hits="0"/>
-						<line number="586" hits="0"/>
-						<line number="587" hits="0"/>
-						<line number="588" hits="0"/>
-						<line number="590" hits="0"/>
-						<line number="595" hits="0"/>
-						<line number="596" hits="0"/>
-						<line number="597" hits="0"/>
-						<line number="599" hits="0"/>
-						<line number="606" hits="0"/>
-						<line number="607" hits="0"/>
-						<line number="608" hits="0"/>
-						<line number="610" hits="0"/>
-						<line number="621" hits="0"/>
-						<line number="622" hits="0"/>
-						<line number="623" hits="0"/>
-						<line number="625" hits="0"/>
-						<line number="633" hits="0"/>
-						<line number="634" hits="0"/>
-						<line number="635" hits="0"/>
-						<line number="637" hits="0"/>
-						<line number="648" hits="0"/>
-						<line number="649" hits="0"/>
-						<line number="650" hits="0"/>
-						<line number="652" hits="0"/>
-						<line number="660" hits="0"/>
-						<line number="661" hits="0"/>
-						<line number="662" hits="0"/>
-						<line number="664" hits="0"/>
-						<line number="674" hits="0"/>
-						<line number="675" hits="0"/>
-						<line number="676" hits="0"/>
-						<line number="678" hits="0"/>
-						<line number="687" hits="0"/>
-						<line number="688" hits="0"/>
-						<line number="689" hits="0"/>
-						<line number="691" hits="0"/>
-						<line number="699" hits="0"/>
-						<line number="700" hits="0"/>
-						<line number="701" hits="0"/>
-						<line number="703" hits="0"/>
-						<line number="710" hits="0"/>
-						<line number="711" hits="0"/>
-						<line number="712" hits="0"/>
-						<line number="714" hits="0"/>
-						<line number="722" hits="0"/>
-						<line number="723" hits="0"/>
-						<line number="724" hits="0"/>
-						<line number="726" hits="0"/>
-						<line number="731" hits="0"/>
-						<line number="732" hits="0"/>
-						<line number="733" hits="0"/>
-						<line number="735" hits="0"/>
-						<line number="741" hits="0"/>
-						<line number="742" hits="0"/>
-						<line number="743" hits="0"/>
-						<line number="745" hits="0"/>
-						<line number="755" hits="0"/>
-						<line number="756" hits="0"/>
-						<line number="757" hits="0"/>
-						<line number="759" hits="0"/>
-						<line number="765" hits="0"/>
-						<line number="766" hits="0"/>
-						<line number="767" hits="0"/>
-						<line number="769" hits="0"/>
-						<line number="781" hits="0"/>
-						<line number="782" hits="0"/>
-						<line number="783" hits="0"/>
-						<line number="785" hits="0"/>
-						<line number="791" hits="0"/>
-						<line number="792" hits="0"/>
-						<line number="793" hits="0"/>
-						<line number="795" hits="0"/>
-						<line number="799" hits="0"/>
-						<line number="800" hits="0"/>
-						<line number="801" hits="0"/>
-						<line number="803" hits="0"/>
-						<line number="808" hits="0"/>
-						<line number="809" hits="0"/>
-						<line number="810" hits="0"/>
-						<line number="812" hits="0"/>
-						<line number="817" hits="0"/>
-						<line number="818" hits="0"/>
-						<line number="819" hits="0"/>
-						<line number="821" hits="0"/>
-						<line number="830" hits="0"/>
-						<line number="831" hits="0"/>
-						<line number="832" hits="0"/>
-						<line number="834" hits="0"/>
-						<line number="839" hits="0"/>
-						<line number="840" hits="0"/>
-						<line number="841" hits="0"/>
-						<line number="843" hits="0"/>
-						<line number="850" hits="0"/>
-						<line number="851" hits="0"/>
-						<line number="852" hits="0"/>
-						<line number="854" hits="0"/>
-						<line number="859" hits="0"/>
-						<line number="860" hits="0"/>
-						<line number="861" hits="0"/>
-						<line number="863" hits="0"/>
-						<line number="876" hits="0"/>
-						<line number="877" hits="0"/>
-						<line number="878" hits="0"/>
-						<line number="880" hits="0"/>
-						<line number="885" hits="0"/>
-						<line number="886" hits="0"/>
-						<line number="887" hits="0"/>
-						<line number="889" hits="0"/>
-						<line number="894" hits="0"/>
-						<line number="895" hits="0"/>
-						<line number="896" hits="0"/>
-						<line number="898" hits="0"/>
-						<line number="907" hits="0"/>
-						<line number="908" hits="0"/>
-						<line number="909" hits="0"/>
-						<line number="911" hits="0"/>
-						<line number="918" hits="0"/>
-						<line number="919" hits="0"/>
-						<line number="920" hits="0"/>
-						<line number="922" hits="0"/>
-						<line number="927" hits="0"/>
-						<line number="928" hits="0"/>
-						<line number="929" hits="0"/>
-						<line number="931" hits="0"/>
-						<line number="936" hits="0"/>
-						<line number="937" hits="0"/>
-						<line number="938" hits="0"/>
-						<line number="940" hits="0"/>
-						<line number="954" hits="0"/>
-						<line number="955" hits="0"/>
-						<line number="956" hits="0"/>
-						<line number="958" hits="0"/>
-						<line number="967" hits="0"/>
-						<line number="968" hits="0"/>
-						<line number="969" hits="0"/>
-						<line number="971" hits="0"/>
-						<line number="979" hits="0"/>
-						<line number="980" hits="0"/>
-						<line number="981" hits="0"/>
-						<line number="983" hits="0"/>
-						<line number="989" hits="0"/>
-						<line number="990" hits="0"/>
-						<line number="991" hits="0"/>
-						<line number="993" hits="0"/>
-						<line number="1000" hits="0"/>
-						<line number="1001" hits="0"/>
-						<line number="1002" hits="0"/>
-						<line number="1004" hits="0"/>
-						<line number="1014" hits="0"/>
-						<line number="1015" hits="0"/>
-						<line number="1016" hits="0"/>
-						<line number="1018" hits="0"/>
-						<line number="1024" hits="0"/>
-						<line number="1025" hits="0"/>
-						<line number="1026" hits="0"/>
-						<line number="1028" hits="0"/>
-						<line number="1032" hits="0"/>
-						<line number="1033" hits="0"/>
-						<line number="1034" hits="0"/>
-						<line number="1036" hits="0"/>
-						<line number="1041" hits="0"/>
-						<line number="1042" hits="0"/>
-						<line number="1043" hits="0"/>
-						<line number="1045" hits="0"/>
-						<line number="1050" hits="0"/>
-						<line number="1051" hits="0"/>
-						<line number="1052" hits="0"/>
-						<line number="1054" hits="0"/>
-						<line number="1060" hits="0"/>
-						<line number="1061" hits="0"/>
-						<line number="1062" hits="0"/>
-						<line number="1064" hits="0"/>
-						<line number="1079" hits="0"/>
-						<line number="1080" hits="0"/>
-						<line number="1081" hits="0"/>
-						<line number="1083" hits="0"/>
-						<line number="1087" hits="0"/>
-						<line number="1088" hits="0"/>
-						<line number="1089" hits="0"/>
-						<line number="1091" hits="0"/>
-						<line number="1096" hits="0"/>
-						<line number="1097" hits="0"/>
-						<line number="1098" hits="0"/>
-						<line number="1101" hits="0"/>
-						<line number="1102" hits="0"/>
-						<line number="1429" hits="0"/>
-						<line number="1432" hits="0"/>
-						<line number="1436" hits="0"/>
-						<line number="1457" hits="0"/>
-						<line number="1458" hits="0"/>
-						<line number="1470" hits="0"/>
-						<line number="1486" hits="0"/>
-						<line number="1487" hits="0"/>
-						<line number="1499" hits="0"/>
-						<line number="1515" hits="0"/>
-						<line number="1516" hits="0"/>
-						<line number="1528" hits="0"/>
-						<line number="1544" hits="0"/>
-						<line number="1545" hits="0"/>
-						<line number="1557" hits="0"/>
-						<line number="1573" hits="0"/>
-						<line number="1574" hits="0"/>
-						<line number="1586" hits="0"/>
-						<line number="1602" hits="0"/>
-						<line number="1603" hits="0"/>
-						<line number="1615" hits="0"/>
-						<line number="1631" hits="0"/>
-						<line number="1632" hits="0"/>
-						<line number="1644" hits="0"/>
-						<line number="1660" hits="0"/>
-						<line number="1661" hits="0"/>
-						<line number="1673" hits="0"/>
-						<line number="1689" hits="0"/>
-						<line number="1690" hits="0"/>
-						<line number="1702" hits="0"/>
-						<line number="1718" hits="0"/>
-						<line number="1719" hits="0"/>
-						<line number="1731" hits="0"/>
-						<line number="1747" hits="0"/>
-						<line number="1748" hits="0"/>
-						<line number="1760" hits="0"/>
-						<line number="1776" hits="0"/>
-						<line number="1777" hits="0"/>
-						<line number="1789" hits="0"/>
-						<line number="1805" hits="0"/>
-						<line number="1806" hits="0"/>
-						<line number="1818" hits="0"/>
-						<line number="1834" hits="0"/>
-						<line number="1835" hits="0"/>
-						<line number="1847" hits="0"/>
-						<line number="1863" hits="0"/>
-						<line number="1864" hits="0"/>
-						<line number="1876" hits="0"/>
-						<line number="1892" hits="0"/>
-						<line number="1893" hits="0"/>
-						<line number="1905" hits="0"/>
-						<line number="1921" hits="0"/>
-						<line number="1922" hits="0"/>
-						<line number="1934" hits="0"/>
-						<line number="1950" hits="0"/>
-						<line number="1951" hits="0"/>
-						<line number="1963" hits="0"/>
-						<line number="1979" hits="0"/>
-						<line number="1980" hits="0"/>
-						<line number="1992" hits="0"/>
-						<line number="2008" hits="0"/>
-						<line number="2009" hits="0"/>
-						<line number="2021" hits="0"/>
-						<line number="2037" hits="0"/>
-						<line number="2038" hits="0"/>
-						<line number="2050" hits="0"/>
-						<line number="2066" hits="0"/>
-						<line number="2067" hits="0"/>
-						<line number="2079" hits="0"/>
-						<line number="2095" hits="0"/>
-						<line number="2096" hits="0"/>
-						<line number="2108" hits="0"/>
-						<line number="2124" hits="0"/>
-						<line number="2125" hits="0"/>
-						<line number="2137" hits="0"/>
-						<line number="2153" hits="0"/>
-						<line number="2154" hits="0"/>
-						<line number="2166" hits="0"/>
-						<line number="2182" hits="0"/>
-						<line number="2183" hits="0"/>
-						<line number="2195" hits="0"/>
-						<line number="2211" hits="0"/>
-						<line number="2212" hits="0"/>
-						<line number="2224" hits="0"/>
-						<line number="2240" hits="0"/>
-						<line number="2241" hits="0"/>
-						<line number="2253" hits="0"/>
-						<line number="2269" hits="0"/>
-						<line number="2270" hits="0"/>
-						<line number="2282" hits="0"/>
-						<line number="2298" hits="0"/>
-						<line number="2299" hits="0"/>
-						<line number="2311" hits="0"/>
-						<line number="2327" hits="0"/>
-						<line number="2328" hits="0"/>
-						<line number="2340" hits="0"/>
-						<line number="2356" hits="0"/>
-						<line number="2357" hits="0"/>
-						<line number="2369" hits="0"/>
-						<line number="2385" hits="0"/>
-						<line number="2386" hits="0"/>
-						<line number="2398" hits="0"/>
-						<line number="2414" hits="0"/>
-						<line number="2415" hits="0"/>
-						<line number="2427" hits="0"/>
-						<line number="2443" hits="0"/>
-						<line number="2444" hits="0"/>
-						<line number="2456" hits="0"/>
-						<line number="2472" hits="0"/>
-						<line number="2473" hits="0"/>
-						<line number="2485" hits="0"/>
-						<line number="2501" hits="0"/>
-						<line number="2502" hits="0"/>
-						<line number="2514" hits="0"/>
-						<line number="2530" hits="0"/>
-						<line number="2531" hits="0"/>
-						<line number="2543" hits="0"/>
-						<line number="2559" hits="0"/>
-						<line number="2560" hits="0"/>
-						<line number="2572" hits="0"/>
-						<line number="2588" hits="0"/>
-						<line number="2589" hits="0"/>
-						<line number="2601" hits="0"/>
-						<line number="2617" hits="0"/>
-						<line number="2618" hits="0"/>
-						<line number="2630" hits="0"/>
-						<line number="2646" hits="0"/>
-						<line number="2647" hits="0"/>
-						<line number="2659" hits="0"/>
-						<line number="2675" hits="0"/>
-						<line number="2676" hits="0"/>
-						<line number="2688" hits="0"/>
-						<line number="2704" hits="0"/>
-						<line number="2705" hits="0"/>
-						<line number="2717" hits="0"/>
-						<line number="2733" hits="0"/>
-						<line number="2734" hits="0"/>
-						<line number="2746" hits="0"/>
-						<line number="2762" hits="0"/>
-						<line number="2763" hits="0"/>
-						<line number="2775" hits="0"/>
-						<line number="2791" hits="0"/>
-						<line number="2792" hits="0"/>
-						<line number="2804" hits="0"/>
-						<line number="2820" hits="0"/>
-						<line number="2821" hits="0"/>
-						<line number="2833" hits="0"/>
-						<line number="2849" hits="0"/>
-						<line number="2850" hits="0"/>
-						<line number="2862" hits="0"/>
-						<line number="2878" hits="0"/>
-						<line number="2879" hits="0"/>
-						<line number="2891" hits="0"/>
-						<line number="2907" hits="0"/>
-						<line number="2908" hits="0"/>
-						<line number="2920" hits="0"/>
-						<line number="2936" hits="0"/>
-						<line number="2937" hits="0"/>
-						<line number="2949" hits="0"/>
-						<line number="2965" hits="0"/>
-						<line number="2966" hits="0"/>
-						<line number="2978" hits="0"/>
-						<line number="2994" hits="0"/>
-						<line number="2995" hits="0"/>
-						<line number="3007" hits="0"/>
-						<line number="3023" hits="0"/>
-						<line number="3024" hits="0"/>
-						<line number="3036" hits="0"/>
-						<line number="3052" hits="0"/>
-						<line number="3053" hits="0"/>
-						<line number="3065" hits="0"/>
-						<line number="3081" hits="0"/>
-						<line number="3082" hits="0"/>
-						<line number="3094" hits="0"/>
-						<line number="3110" hits="0"/>
-						<line number="3111" hits="0"/>
-						<line number="3123" hits="0"/>
-						<line number="3139" hits="0"/>
-						<line number="3140" hits="0"/>
-						<line number="3152" hits="0"/>
-						<line number="3168" hits="0"/>
-						<line number="3169" hits="0"/>
-						<line number="3181" hits="0"/>
-						<line number="3197" hits="0"/>
-						<line number="3198" hits="0"/>
-						<line number="3210" hits="0"/>
-						<line number="3226" hits="0"/>
-						<line number="3227" hits="0"/>
-						<line number="3239" hits="0"/>
-						<line number="3255" hits="0"/>
-						<line number="3256" hits="0"/>
-						<line number="3268" hits="0"/>
-						<line number="3284" hits="0"/>
-						<line number="3285" hits="0"/>
-						<line number="3297" hits="0"/>
-						<line number="3313" hits="0"/>
-						<line number="3314" hits="0"/>
-						<line number="3326" hits="0"/>
-					</lines>
-				</class>
-				<class name="router_pb2.py" filename="wallets/lnd_grpc_files/router_pb2.py" complexity="0" line-rate="0" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="4" hits="0"/>
-						<line number="5" hits="0"/>
-						<line number="6" hits="0"/>
-						<line number="7" hits="0"/>
-						<line number="8" hits="0"/>
-						<line number="9" hits="0"/>
-						<line number="10" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="17" hits="0"/>
-						<line number="19" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="27" hits="0"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
-						<line number="44" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="56" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="76" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="113" hits="0"/>
-						<line number="114" hits="0"/>
-						<line number="115" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="121" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="126" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="157" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="212" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="223" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="234" hits="0"/>
-						<line number="236" hits="0"/>
-						<line number="245" hits="0"/>
-						<line number="247" hits="0"/>
-						<line number="256" hits="0"/>
-						<line number="258" hits="0"/>
-						<line number="267" hits="0"/>
-						<line number="269" hits="0"/>
-						<line number="278" hits="0"/>
-						<line number="280" hits="0"/>
-						<line number="289" hits="0"/>
-						<line number="291" hits="0"/>
-						<line number="300" hits="0"/>
-						<line number="302" hits="0"/>
-						<line number="311" hits="0"/>
-						<line number="313" hits="0"/>
-						<line number="322" hits="0"/>
-						<line number="324" hits="0"/>
-						<line number="333" hits="0"/>
-						<line number="335" hits="0"/>
-						<line number="344" hits="0"/>
-						<line number="346" hits="0"/>
-						<line number="355" hits="0"/>
-						<line number="357" hits="0"/>
-						<line number="366" hits="0"/>
-						<line number="368" hits="0"/>
-						<line number="377" hits="0"/>
-						<line number="379" hits="0"/>
-						<line number="388" hits="0"/>
-						<line number="390" hits="0"/>
-						<line number="399" hits="0"/>
-						<line number="401" hits="0"/>
-						<line number="410" hits="0"/>
-						<line number="412" hits="0"/>
-						<line number="421" hits="0"/>
-						<line number="423" hits="0"/>
-						<line number="432" hits="0"/>
-						<line number="434" hits="0"/>
-						<line number="443" hits="0"/>
-						<line number="445" hits="0"/>
-						<line number="454" hits="0"/>
-						<line number="456" hits="0"/>
-						<line number="465" hits="0"/>
-						<line number="467" hits="0"/>
-						<line number="476" hits="0"/>
-						<line number="478" hits="0"/>
-						<line number="487" hits="0"/>
-						<line number="489" hits="0"/>
-						<line number="498" hits="0"/>
-						<line number="500" hits="0"/>
-						<line number="518" hits="0"/>
-						<line number="519" hits="0"/>
-						<line number="521" hits="0"/>
-						<line number="530" hits="0"/>
-						<line number="532" hits="0"/>
-						<line number="541" hits="0"/>
-						<line number="543" hits="0"/>
-						<line number="552" hits="0"/>
-						<line number="554" hits="0"/>
-						<line number="555" hits="0"/>
-						<line number="557" hits="0"/>
-						<line number="558" hits="0"/>
-						<line number="561" hits="0"/>
-						<line number="562" hits="0"/>
-						<line number="563" hits="0"/>
-						<line number="564" hits="0"/>
-						<line number="567" hits="0"/>
-						<line number="568" hits="0"/>
-						<line number="569" hits="0"/>
-						<line number="570" hits="0"/>
-						<line number="571" hits="0"/>
-						<line number="572" hits="0"/>
-						<line number="573" hits="0"/>
-						<line number="574" hits="0"/>
-						<line number="575" hits="0"/>
-						<line number="576" hits="0"/>
-						<line number="577" hits="0"/>
-						<line number="578" hits="0"/>
-						<line number="579" hits="0"/>
-						<line number="580" hits="0"/>
-						<line number="581" hits="0"/>
-						<line number="582" hits="0"/>
-						<line number="583" hits="0"/>
-						<line number="584" hits="0"/>
-						<line number="585" hits="0"/>
-						<line number="586" hits="0"/>
-						<line number="587" hits="0"/>
-						<line number="588" hits="0"/>
-						<line number="589" hits="0"/>
-						<line number="590" hits="0"/>
-						<line number="591" hits="0"/>
-						<line number="592" hits="0"/>
-						<line number="593" hits="0"/>
-						<line number="594" hits="0"/>
-						<line number="595" hits="0"/>
-						<line number="596" hits="0"/>
-						<line number="597" hits="0"/>
-						<line number="598" hits="0"/>
-						<line number="599" hits="0"/>
-						<line number="600" hits="0"/>
-						<line number="601" hits="0"/>
-						<line number="602" hits="0"/>
-						<line number="603" hits="0"/>
-						<line number="604" hits="0"/>
-						<line number="605" hits="0"/>
-						<line number="606" hits="0"/>
-						<line number="607" hits="0"/>
-						<line number="608" hits="0"/>
-						<line number="609" hits="0"/>
-						<line number="610" hits="0"/>
-						<line number="611" hits="0"/>
-						<line number="612" hits="0"/>
-						<line number="613" hits="0"/>
-						<line number="614" hits="0"/>
-						<line number="615" hits="0"/>
-						<line number="616" hits="0"/>
-						<line number="617" hits="0"/>
-						<line number="618" hits="0"/>
-						<line number="619" hits="0"/>
-						<line number="620" hits="0"/>
-						<line number="621" hits="0"/>
-						<line number="622" hits="0"/>
-						<line number="623" hits="0"/>
-						<line number="624" hits="0"/>
-						<line number="625" hits="0"/>
-						<line number="626" hits="0"/>
-						<line number="627" hits="0"/>
-						<line number="628" hits="0"/>
-						<line number="629" hits="0"/>
-						<line number="630" hits="0"/>
-						<line number="631" hits="0"/>
-						<line number="632" hits="0"/>
-						<line number="633" hits="0"/>
-						<line number="634" hits="0"/>
-						<line number="635" hits="0"/>
-						<line number="636" hits="0"/>
-						<line number="637" hits="0"/>
-						<line number="638" hits="0"/>
-						<line number="639" hits="0"/>
-						<line number="640" hits="0"/>
-						<line number="641" hits="0"/>
-						<line number="642" hits="0"/>
-						<line number="643" hits="0"/>
-						<line number="644" hits="0"/>
-						<line number="645" hits="0"/>
-						<line number="646" hits="0"/>
-						<line number="647" hits="0"/>
-						<line number="648" hits="0"/>
-						<line number="649" hits="0"/>
-						<line number="650" hits="0"/>
-						<line number="651" hits="0"/>
-						<line number="652" hits="0"/>
-						<line number="653" hits="0"/>
-						<line number="654" hits="0"/>
-						<line number="655" hits="0"/>
-						<line number="656" hits="0"/>
-						<line number="657" hits="0"/>
-						<line number="658" hits="0"/>
-						<line number="659" hits="0"/>
-						<line number="660" hits="0"/>
-						<line number="661" hits="0"/>
-						<line number="662" hits="0"/>
-						<line number="663" hits="0"/>
-						<line number="664" hits="0"/>
-					</lines>
-				</class>
-				<class name="router_pb2_grpc.py" filename="wallets/lnd_grpc_files/router_pb2_grpc.py" complexity="0" line-rate="0" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="2" hits="0"/>
-						<line number="3" hits="0"/>
-						<line number="5" hits="0"/>
-						<line number="6" hits="0"/>
-						<line number="9" hits="0"/>
-						<line number="14" hits="0"/>
-						<line number="20" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="45" hits="0"/>
-						<line number="50" hits="0"/>
-						<line number="55" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="75" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="100" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="112" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="128" hits="0"/>
-						<line number="129" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="136" hits="0"/>
-						<line number="137" hits="0"/>
-						<line number="138" hits="0"/>
-						<line number="140" hits="0"/>
-						<line number="148" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="152" hits="0"/>
-						<line number="159" hits="0"/>
-						<line number="160" hits="0"/>
-						<line number="161" hits="0"/>
-						<line number="163" hits="0"/>
-						<line number="168" hits="0"/>
-						<line number="169" hits="0"/>
-						<line number="170" hits="0"/>
-						<line number="172" hits="0"/>
-						<line number="177" hits="0"/>
-						<line number="178" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="188" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="206" hits="0"/>
-						<line number="207" hits="0"/>
-						<line number="209" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="216" hits="0"/>
-						<line number="218" hits="0"/>
-						<line number="224" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="226" hits="0"/>
-						<line number="228" hits="0"/>
-						<line number="233" hits="0"/>
-						<line number="234" hits="0"/>
-						<line number="235" hits="0"/>
-						<line number="237" hits="0"/>
-						<line number="243" hits="0"/>
-						<line number="244" hits="0"/>
-						<line number="245" hits="0"/>
-						<line number="247" hits="0"/>
-						<line number="252" hits="0"/>
-						<line number="253" hits="0"/>
-						<line number="254" hits="0"/>
-						<line number="256" hits="0"/>
-						<line number="264" hits="0"/>
-						<line number="265" hits="0"/>
-						<line number="266" hits="0"/>
-						<line number="268" hits="0"/>
-						<line number="275" hits="0"/>
-						<line number="276" hits="0"/>
-						<line number="277" hits="0"/>
-						<line number="280" hits="0"/>
-						<line number="281" hits="0"/>
-						<line number="368" hits="0"/>
-						<line number="371" hits="0"/>
-						<line number="375" hits="0"/>
-						<line number="380" hits="0"/>
-						<line number="381" hits="0"/>
-						<line number="393" hits="0"/>
-						<line number="409" hits="0"/>
-						<line number="410" hits="0"/>
-						<line number="422" hits="0"/>
-						<line number="438" hits="0"/>
-						<line number="439" hits="0"/>
-						<line number="451" hits="0"/>
-						<line number="467" hits="0"/>
-						<line number="468" hits="0"/>
-						<line number="480" hits="0"/>
-						<line number="496" hits="0"/>
-						<line number="497" hits="0"/>
-						<line number="509" hits="0"/>
-						<line number="525" hits="0"/>
-						<line number="526" hits="0"/>
-						<line number="538" hits="0"/>
-						<line number="554" hits="0"/>
-						<line number="555" hits="0"/>
-						<line number="567" hits="0"/>
-						<line number="583" hits="0"/>
-						<line number="584" hits="0"/>
-						<line number="596" hits="0"/>
-						<line number="612" hits="0"/>
-						<line number="613" hits="0"/>
-						<line number="625" hits="0"/>
-						<line number="641" hits="0"/>
-						<line number="642" hits="0"/>
-						<line number="654" hits="0"/>
-						<line number="670" hits="0"/>
-						<line number="671" hits="0"/>
-						<line number="683" hits="0"/>
-						<line number="699" hits="0"/>
-						<line number="700" hits="0"/>
-						<line number="712" hits="0"/>
-						<line number="728" hits="0"/>
-						<line number="729" hits="0"/>
-						<line number="741" hits="0"/>
-						<line number="757" hits="0"/>
-						<line number="758" hits="0"/>
-						<line number="770" hits="0"/>
-						<line number="786" hits="0"/>
-						<line number="787" hits="0"/>
-						<line number="799" hits="0"/>
-						<line number="815" hits="0"/>
-						<line number="816" hits="0"/>
-						<line number="828" hits="0"/>
-						<line number="844" hits="0"/>
-						<line number="845" hits="0"/>
-						<line number="857" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-		<package name="wallets.macaroon" line-rate="0.2857" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="wallets/macaroon/__init__.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-					</lines>
-				</class>
-				<class name="macaroon.py" filename="wallets/macaroon/macaroon.py" complexity="0" line-rate="0.2754" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
-						<line number="25" hits="0"/>
-						<line number="26" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="32" hits="0"/>
-						<line number="33" hits="0"/>
-						<line number="36" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
-						<line number="55" hits="1"/>
-						<line number="56" hits="0"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="65" hits="1"/>
-						<line number="67" hits="0"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="0"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="0"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="0"/>
-						<line number="76" hits="1"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="83" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="88" hits="0"/>
-						<line number="89" hits="0"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="104" hits="1"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="109" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-	</packages>
-</coverage>
diff --git a/lnbits/extensions/nostradmin/README.md b/lnbits/extensions/nostradmin/README.md
deleted file mode 100644
index 596cce9d..00000000
--- a/lnbits/extensions/nostradmin/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Nostr
-
-Opens a Nostr daemon
diff --git a/lnbits/extensions/nostradmin/__init__.py b/lnbits/extensions/nostradmin/__init__.py
deleted file mode 100644
index 91586000..00000000
--- a/lnbits/extensions/nostradmin/__init__.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from fastapi import APIRouter, Request
-
-from lnbits.db import Database
-from lnbits.helpers import template_renderer
-
-from starlette.exceptions import HTTPException
-from starlette.responses import HTMLResponse
-from http import HTTPStatus
-
-from lnbits.settings import LNBITS_ADMIN_EXTENSIONS
-
-nostradmin_ext: APIRouter = APIRouter(prefix="/nostradmin", tags=["nostradmin"])
-
-db = Database("ext_nostradmin")
-if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
-    @nostradmin_ext.get("/", response_class=HTMLResponse)
-    async def index(request: Request):
-        return template_renderer().TemplateResponse(
-                "error.html", {"request": request, "err": "NostrAdmin must be added to LNBITS_ADMIN_EXTENSIONS in .env"}
-            )
-else:
-    
-    def nostr_renderer():
-        return template_renderer(["lnbits/extensions/nostradmin/templates"])
-
-    from .views import *  # noqa
-    from .views_api import *  # noqa
-
-
-
-
-
-
-
-
-
-
diff --git a/lnbits/extensions/nostradmin/config.json b/lnbits/extensions/nostradmin/config.json
deleted file mode 100644
index 2c4f76d3..00000000
--- a/lnbits/extensions/nostradmin/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "NostrAdmin",
-  "short_description": "Admin daemon for Nostr",
-  "icon": "swap_horizontal_circle",
-  "contributors": ["arcbtc"]
-}
diff --git a/lnbits/extensions/nostradmin/crud.py b/lnbits/extensions/nostradmin/crud.py
deleted file mode 100644
index 1e1bf810..00000000
--- a/lnbits/extensions/nostradmin/crud.py
+++ /dev/null
@@ -1,146 +0,0 @@
-from typing import List, Optional, Union
-
-from lnbits.helpers import urlsafe_short_hash
-import shortuuid
-from . import db
-from .models import (
-    nostrKeys,
-    nostrNotes,
-    nostrCreateRelays,
-    nostrRelays,
-    nostrConnections,
-    nostrCreateConnections,
-    nostrRelayList,
-)
-from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
-
-###############KEYS##################
-
-
-async def create_nostrkeys(data: nostrKeys) -> nostrKeys:
-    await db.execute(
-        """
-        INSERT INTO nostradmin.keys (
-            pubkey,
-            privkey
-        )
-        VALUES (?, ?)
-        """,
-        (data.pubkey, data.privkey),
-    )
-    return await get_nostrkeys(nostrkey_id)
-
-
-async def get_nostrkeys(pubkey: str) -> nostrKeys:
-    row = await db.fetchone("SELECT * FROM nostradmin.keys WHERE pubkey = ?", (pubkey,))
-    return nostrKeys(**row) if row else None
-
-
-###############NOTES##################
-
-
-async def create_nostrnotes(data: nostrNotes) -> nostrNotes:
-    await db.execute(
-        """
-        INSERT INTO nostradmin.notes (
-            id,
-            pubkey,
-            created_at,
-            kind,
-            tags,
-            content,
-            sig
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?)
-        """,
-        (
-            data.id,
-            data.pubkey,
-            data.created_at,
-            data.kind,
-            data.tags,
-            data.content,
-            data.sig,
-        ),
-    )
-    return await get_nostrnotes(data.id)
-
-
-async def get_nostrnotes(nostrnote_id: str) -> nostrNotes:
-    row = await db.fetchone("SELECT * FROM nostradmin.notes WHERE id = ?", (nostrnote_id,))
-    return nostrNotes(**row) if row else None
-
-
-###############RELAYS##################
-
-
-async def create_nostrrelays(data: nostrCreateRelays) -> nostrCreateRelays:
-    nostrrelay_id = shortuuid.uuid(name=data.relay)
-
-    if await get_nostrrelay(nostrrelay_id):
-        return "error"
-    await db.execute(
-        """
-        INSERT INTO nostradmin.relays (
-            id,
-            relay
-        )
-        VALUES (?, ?)
-        """,
-        (nostrrelay_id, data.relay),
-    )
-    return await get_nostrrelay(nostrrelay_id)
-
-
-async def get_nostrrelays() -> nostrRelays:
-    rows = await db.fetchall("SELECT * FROM nostradmin.relays")
-    return [nostrRelays(**row) for row in rows]
-
-
-async def get_nostrrelay(nostrrelay_id: str) -> nostrRelays:
-    row = await db.fetchone("SELECT * FROM nostradmin.relays WHERE id = ?", (nostrrelay_id,))
-    return nostrRelays(**row) if row else None
-
-async def update_nostrrelaysetlist(data: nostrRelaySetList) -> nostrRelayList:
-    await db.execute(
-        """
-        UPDATE nostradmin.relaylists SET
-          denylist = ?,
-          allowlist = ?
-        WHERE id = ?
-        """,
-        (data.denylist, data.allowlist, 1),
-    )
-    return await get_nostrrelaylist()
-
-async def get_nostrrelaylist() -> nostrRelayList:
-    row = await db.fetchone("SELECT * FROM nostradmin.relaylists WHERE id = ?", (1,))
-    return nostrRelayList(**row) if row else None
-
-
-###############CONNECTIONS##################
-
-
-async def create_nostrconnections(
-    data: nostrCreateConnections
-) -> nostrCreateConnections:
-    nostrrelay_id = shortuuid.uuid(name=data.relayid + data.pubkey)
-    await db.execute(
-        """
-        INSERT INTO nostradmin.connections (
-            id,
-            pubkey,
-            relayid
-        )
-        VALUES (?, ?, ?)
-        """,
-        (data.id, data.pubkey, data.relayid),
-    )
-    return await get_nostrconnections(data.id)
-
-
-async def get_nostrconnections(nostrconnections_id: str) -> nostrConnections:
-    row = await db.fetchone(
-        "SELECT * FROM nostradmin.connections WHERE id = ?", (nostrconnections_id,)
-    )
-    return nostrConnections(**row) if row else None
diff --git a/lnbits/extensions/nostradmin/migrations.py b/lnbits/extensions/nostradmin/migrations.py
deleted file mode 100644
index 590f72ea..00000000
--- a/lnbits/extensions/nostradmin/migrations.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from lnbits.db import Database
-
-async def m001_initial(db):
-    """
-    Initial nostradmin table.
-    """
-    await db.execute(
-        f"""
-        CREATE TABLE nostradmin.keys (
-            pubkey TEXT NOT NULL PRIMARY KEY,
-            privkey TEXT NOT NULL
-        );
-    """
-    )
-    await db.execute(
-        f"""
-        CREATE TABLE nostradmin.notes (
-            id TEXT NOT NULL PRIMARY KEY,
-            pubkey TEXT NOT NULL,
-            created_at TEXT NOT NULL,
-            kind INT NOT NULL,
-            tags TEXT NOT NULL,
-            content TEXT NOT NULL,
-            sig TEXT NOT NULL
-        );
-    """
-    )
-    await db.execute(
-        f"""
-        CREATE TABLE nostradmin.relays (
-            id TEXT NOT NULL PRIMARY KEY,
-            relay TEXT NOT NULL
-        );
-    """
-    )
-    await db.execute(
-        f"""
-        CREATE TABLE nostradmin.relaylists (
-            id TEXT NOT NULL PRIMARY KEY DEFAULT 1,
-            allowlist TEXT,
-            denylist TEXT
-        );
-    """
-    )
-
-    await db.execute(
-        """
-        INSERT INTO nostradmin.relaylists (
-            id,
-            denylist
-        )
-        VALUES (?, ?)
-        """,
-        ("1", "wss://zucks-meta-relay.com\nwss://nostr.cia.gov",),
-    )
-
-    await db.execute(
-        f"""
-        CREATE TABLE nostradmin.connections (
-            id TEXT NOT NULL PRIMARY KEY,
-            publickey TEXT NOT NULL,
-            relayid TEXT NOT NULL
-        );
-    """
-    )
-    await db.execute(
-        f"""
-        CREATE TABLE nostradmin.subscribed (
-            id TEXT NOT NULL PRIMARY KEY,
-            userPubkey TEXT NOT NULL,
-            subscribedPubkey TEXT NOT NULL
-        );
-    """
-    )
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/models.py b/lnbits/extensions/nostradmin/models.py
deleted file mode 100644
index dc99b083..00000000
--- a/lnbits/extensions/nostradmin/models.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import json
-from sqlite3 import Row
-from typing import Optional
-
-from fastapi import Request
-from pydantic import BaseModel
-from pydantic.main import BaseModel
-from fastapi.param_functions import Query
-
-class nostrKeys(BaseModel):
-    pubkey: str
-    privkey: str
-
-class nostrNotes(BaseModel):
-    id: str
-    pubkey: str
-    created_at: str
-    kind: int
-    tags: str
-    content: str
-    sig: str
-
-class nostrCreateRelays(BaseModel):
-    relay: str = Query(None)
-
-class nostrCreateConnections(BaseModel):
-    pubkey: str = Query(None)
-    relayid: str = Query(None)
-
-class nostrRelays(BaseModel):
-    id: Optional[str]
-    relay: Optional[str]
-    status: Optional[bool] = False
-
-class nostrRelayList(BaseModel):
-    id: str
-    allowlist: Optional[str]
-    denylist: Optional[str]
-
-class nostrRelaySetList(BaseModel):
-    allowlist: Optional[str]
-    denylist: Optional[str] 
-
-class nostrConnections(BaseModel):
-    id: str
-    pubkey: Optional[str]
-    relayid: Optional[str]
-
-class nostrSubscriptions(BaseModel):
-    id: str
-    userPubkey: Optional[str]
-    subscribedPubkey: Optional[str]
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/relay_manager.py b/lnbits/extensions/nostradmin/relay_manager.py
deleted file mode 100644
index cc880ad8..00000000
--- a/lnbits/extensions/nostradmin/relay_manager.py
+++ /dev/null
@@ -1,105 +0,0 @@
-import asyncio
-import logging
-from typing import Any, Dict
-
-import websockets
-
-
-# Many thanks to Fusion44 for https://gist.github.com/fusion44/9af0b054b4609012752b0c8c1dafbd4a
-
-class Relay:
-    url: str
-    read: bool
-    write: bool
-    active: bool
-    _connection: Any
-
-    def __init__(self, url: str, read: bool, write: bool, active: bool) -> None:
-        self.url = url
-        self.read = read
-        self.write = write
-        self.active = active
-
-    async def connect(self):
-        self._connection = await websockets.connect(self.url)
-
-    async def send(self, message):
-        if not self.write or not self.active:
-            raise RuntimeError("Can't send to a relay that is inactive or not writable")
-        await self._connection.send(message)
-
-    async def listen(self):
-        if not self.read or not self.active:
-            raise RuntimeError(
-                "Can't listen to a relay that is inactive or not readable"
-            )
-
-        while True:
-            try:
-                msg = await self._connection.recv()
-                yield msg
-            except websockets.ConnectionClosedOK:
-                break
-
-
-class RelayManager:
-    _relays: Dict[str, Relay] = {}
-    _tasks: Dict[str, asyncio.Task] = {}
-    msg_channel = asyncio.Queue()
-
-    def __init__(self, enable_ws_debugger=False) -> None:
-        if enable_ws_debugger:
-            logger = logging.getLogger("websockets")
-            logger.setLevel(logging.DEBUG)
-            logger.addHandler(logging.StreamHandler())
-        pass
-
-    async def add_relay(self, relay: Relay):
-        if relay.url in self._relays.keys():
-            raise RuntimeError(f"Relay {relay.url} exists")
-
-        if relay.active and relay.read:
-            await relay.connect()
-            loop = asyncio.get_event_loop()
-            t = loop.create_task(self._relay_listener(relay, self.msg_channel))
-            self._tasks[relay.url] = t
-
-        self._relays[relay.url] = relay
-
-    async def remove_relay(self, url: str):
-        if url in self._relays.keys():
-            relay = self._relays[url]
-            if relay.active:
-                t = self._tasks[url]
-                t.cancel()
-                try:
-                    await t
-                except asyncio.CancelledError:
-                    print(f"Canceled task {relay.url}")
-
-    def get_relay(self, url: str) -> Relay:
-        if not url in self._relays.keys():
-            raise RuntimeError("Relay not found")
-        return self._relays.get(url)
-
-    async def update_relay(self, relay: Relay):
-        if relay.url in self._relays.keys():
-            # remove the old relay
-            await self.remove_relay(relay.url)
-
-            # add the new relay
-            await self.add_relay(relay)
-        else:
-            raise RuntimeError("Unknown Relay")
-
-    async def send_to_all(self, message):
-        for r in self._relays.values():
-            if r.write:
-                await r.send(message=message)
-
-    async def _relay_listener(self, relay: Relay, msg_chan: asyncio.Queue):
-        print(f"listening for {relay.url}")
-        async for msg in relay.listen():
-            print(msg)
-            msg_chan.put_nowait(msg)
-        print(f"STOP listening for {relay.url}")
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/templates/nostradmin/index.html b/lnbits/extensions/nostradmin/templates/nostradmin/index.html
deleted file mode 100644
index 57552bf2..00000000
--- a/lnbits/extensions/nostradmin/templates/nostradmin/index.html
+++ /dev/null
@@ -1,303 +0,0 @@
-{% 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>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">NOSTR RELAYS ONLINE</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="exportlnurldeviceCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          flat
-          dense
-          :data="nostrrelayLinks"
-          row-key="id"
-          :columns="nostrTable.columns"
-          :pagination.sync="nostrTable.pagination"
-          :filter="filter"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <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
-                v-for="col in props.cols"
-                :key="col.name"
-                :props="props"
-                auto-width
-              >
-                <div v-if="col.name == 'id'"></div>
-                <div v-else>
-                  <div v-if="col.value == true" style="background-color: green">
-                    {{ col.value }}
-                  </div>
-                  <div v-else>{{ col.value }}</div>
-                </div>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-    <q-card>
-      <q-tabs
-        v-model="listSelection"
-        dense
-        class="text-grey"
-        active-color="primary"
-        indicator-color="primary"
-        align="justify"
-        narrow-indicator
-      >
-        <q-tab name="denylist" label="Deny List"></q-tab>
-        <q-tab name="allowlist" label="Allow List"></q-tab>
-      </q-tabs>
-
-      <q-separator></q-separator>
-
-      <q-tab-panels v-model="listSelection" animated>
-        <q-tab-panel name="denylist">
-          <div class="text-h6">Relays in this list will NOT be used</div>
-          <q-form class="q-gutter-md q-y-md" @submit="setRelayList">
-            <div class="row">
-              <div class="col q-mx-lg">
-                <q-input
-                  v-model="setList.denylist"
-                  dense
-                  filled
-                  autogrow
-                ></q-input>
-              </div>
-              <div
-                class="col q-mx-lg items-align flex items-center justify-center"
-              >
-                <q-btn unelevated color="primary" type="submit">
-                  Update Deny List
-                </q-btn>
-              </div>
-            </div>
-          </q-form>
-        </q-tab-panel>
-
-        <q-tab-panel name="allowlist">
-          <div class="text-h6">ONLY relays in this list will be used</div>
-          <q-form class="q-gutter-md q-y-md" @submit="setRelayList">
-            <div class="row">
-              <div class="col q-mx-lg">
-                <q-input
-                  v-model="setList.allowlist"
-                  dense
-                  filled
-                  autogrow
-                ></q-input>
-              </div>
-              <div
-                class="col q-mx-lg items-align flex items-center justify-center"
-              >
-                <q-btn unelevated color="primary" type="submit">
-                  Update Allow List
-                </q-btn>
-              </div>
-            </div>
-          </q-form>
-        </q-tab-panel>
-      </q-tab-panels>
-    </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">{{SITE_TITLE}} Nostr Extension</h6>
-        <p>Only Admin users can manage this extension</p>
-
-        <q-card-section></q-card-section>
-      </q-card-section>
-    </q-card>
-  </div>
-</div>
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-<script>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  var maplrelays = 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'
-      )
-    }
-    return obj
-  }
-
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        listSelection: 'denylist',
-        setList: {
-          allowlist: '',
-          denylist: ''
-        },
-        nostrrelayLinks: [],
-        filter: '',
-        nostrTable: {
-          columns: [
-            {
-              name: 'wah',
-              align: 'left',
-              label: 'id',
-              field: 'id'
-            },
-            {
-              name: 'relay',
-              align: 'left',
-              label: 'relay',
-              field: 'relay'
-            },
-            {
-              name: 'status',
-              align: 'left',
-              label: 'status',
-              field: 'status'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        }
-      }
-    },
-    methods: {
-      getRelays: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/nostradmin/api/v1/relays',
-            self.g.user.wallets[0].adminkey
-          )
-          .then(function (response) {
-            if (response.data) {
-              console.log(response.data)
-              response.data.map(maplrelays)
-              self.nostrrelayLinks = response.data
-              console.log(self.nostrrelayLinks)
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      setAllowList: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'POST',
-            '/nostradmin/api/v1/allowlist',
-            self.g.user.wallets[0].adminkey,
-            self.allowList
-          )
-          .then(function (response) {
-            if (response.data) {
-              self.allowList = response.data
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      setRelayList: function () {
-        var self = this
-        console.log(self.setList)
-        LNbits.api
-          .request(
-            'POST',
-            '/nostradmin/api/v1/setlist',
-            self.g.user.wallets[0].adminkey,
-            self.setList
-          )
-          .then(function (response) {
-            if (response.data) {
-              console.log(response.data)
-              // self.denyList = response.data
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getLists: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/nostradmin/api/v1/relaylist',
-            self.g.user.wallets[0].adminkey
-          )
-          .then(function (response) {
-            if (response.data) {
-              console.log(response.data)
-              self.setList.denylist = response.data.denylist
-              self.setList.allowlist = response.data.allowlist
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      exportlnurldeviceCSV: function () {
-        var self = this
-        LNbits.utils.exportCSV(self.nostrTable.columns, this.nostrLinks)
-      }
-    },
-    created: function () {
-      var self = this
-      this.getRelays()
-      this.getLists()
-    }
-  })
-</script>
-{% endblock %}
diff --git a/lnbits/extensions/nostradmin/views.py b/lnbits/extensions/nostradmin/views.py
deleted file mode 100644
index 705feba7..00000000
--- a/lnbits/extensions/nostradmin/views.py
+++ /dev/null
@@ -1,110 +0,0 @@
-from http import HTTPStatus
-import asyncio
-from fastapi import Request
-from fastapi.param_functions import Query
-from fastapi.params import Depends
-from fastapi.templating import Jinja2Templates
-from starlette.exceptions import HTTPException
-from starlette.responses import HTMLResponse
-from . import nostradmin_ext, nostr_renderer
-# FastAPI good for incoming
-from fastapi import Request, WebSocket, WebSocketDisconnect
-# Websockets needed for outgoing 
-import websockets
-
-from lnbits.core.crud import update_payment_status
-from lnbits.core.models import User
-from lnbits.core.views.api import api_payment
-from lnbits.decorators import check_user_exists
-
-from .crud import get_nostrkeys, get_nostrrelay
-from .relay_manager import RelayManager, Relay
-
-templates = Jinja2Templates(directory="templates")
-
-nostradmin = True
-
-@nostradmin_ext.get("/", response_class=HTMLResponse)
-async def index(request: Request, user: User = Depends(check_user_exists)):
-    return nostr_renderer().TemplateResponse(
-        "nostradmin/index.html", {"request": request, "user": user.dict()}
-    )
-
-#####################################################################
-#################### NOSTR WEBSOCKET THREAD #########################
-##### THE QUEUE LOOP THREAD THING THAT LISTENS TO BUNCH OF ##########
-### WEBSOCKET CONNECTIONS, STORING DATA IN DB/PUSHING TO FRONTEND ###
-################### VIA updater() FUNCTION ##########################
-#####################################################################
-
-websocket_queue = asyncio.Queue(1000)
-
-
-mgr: RelayManager = RelayManager(enable_ws_debugger=False)
-
-# listen for events coming from relays
-
-
-async def connectToNostr():
-    while True:
-        e = await mgr.msg_channel.get()
-        print(e)
-connectToNostr
-#####################################################################
-################### LNBITS WEBSOCKET ROUTES #########################
-#### HERE IS WHERE LNBITS FRONTEND CAN RECEIVE AND SEND MESSAGES ####
-#####################################################################
-
-class ConnectionManager:
-    def __init__(self):
-        self.active_connections: List[WebSocket] = []
-
-    async def connect(self, websocket: WebSocket, nostr_id: str):
-        await websocket.accept()
-        websocket.id = nostr_id
-        self.active_connections.append(websocket)
-
-    def disconnect(self, websocket: WebSocket):
-        self.active_connections.remove(websocket)
-
-    async def send_personal_message(self, message: str, nostr_id: str):
-        for connection in self.active_connections:
-            if connection.id == nostr_id:
-                await connection.send_text(message)
-
-    async def broadcast(self, message: str):
-        for connection in self.active_connections:
-            await connection.send_text(message)
-
-
-manager = ConnectionManager()
-
-
-@nostradmin_ext.websocket("/nostradmin/ws/relayevents/{nostr_id}", name="nostr_id.websocket_by_id")
-async def websocket_endpoint(websocket: WebSocket, nostr_id: str):
-    await manager.connect(websocket, nostr_id)
-    try:
-        while True:
-            data = await websocket.receive_text()
-    except WebSocketDisconnect:
-        manager.disconnect(websocket)
-
-
-async def updater(nostr_id, message):
-    copilot = await get_copilot(nostr_id)
-    if not copilot:
-        return
-    await manager.send_personal_message(f"{message}", nostr_id)
-
-
-async def relay_check(relay: str):
-    async with websockets.connect(relay) as websocket:
-            if str(websocket.state) == "State.OPEN":
-                r = Relay(url=relay, read=True, write=True, active=True)
-                try:
-                    await mgr.add_relay(r)
-                except:
-                    None
-                return True
-            else:
-                return False
\ No newline at end of file
diff --git a/lnbits/extensions/nostradmin/views_api.py b/lnbits/extensions/nostradmin/views_api.py
deleted file mode 100644
index 4ff89704..00000000
--- a/lnbits/extensions/nostradmin/views_api.py
+++ /dev/null
@@ -1,63 +0,0 @@
-from http import HTTPStatus
-import asyncio
-from fastapi import Request
-from fastapi.param_functions import Query
-from fastapi.params import Depends
-from starlette.exceptions import HTTPException
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnbits.utils.exchange_rates import currencies
-
-from lnbits.settings import LNBITS_ADMIN_USERS
-from . import nostradmin_ext
-from .crud import (
-    create_nostrkeys,
-    get_nostrkeys,
-    create_nostrnotes,
-    get_nostrnotes,
-    create_nostrrelays,
-    get_nostrrelays,
-    get_nostrrelaylist,
-    update_nostrrelaysetlist,
-    create_nostrconnections,
-    get_nostrconnections,
-)
-from .models import nostrKeys, nostrCreateRelays, nostrRelaySetList
-from .views import relay_check
-
-@nostradmin_ext.get("/api/v1/relays")
-async def api_relays_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
-    relays = await get_nostrrelays()
-    if not relays:
-        await create_nostrrelays(nostrCreateRelays(relay="wss://relayer.fiatjaf.com"))
-        await create_nostrrelays(
-            nostrCreateRelays(relay="wss://nostr-pub.wellorder.net")
-        )
-        relays = await get_nostrrelays()
-    if not relays:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
-        )
-    else:
-        for relay in relays:
-            relay.status = await relay_check(relay.relay)
-        return relays
-
-
-
-@nostradmin_ext.get("/api/v1/relaylist")
-async def api_relaylist(wallet: WalletTypeInfo = Depends(get_key_type)):
-    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
-        )
-    return await get_nostrrelaylist()
-
-@nostradmin_ext.post("/api/v1/setlist")
-async def api_relayssetlist(data: nostrRelaySetList, wallet: WalletTypeInfo = Depends(get_key_type)):
-    if wallet.wallet.user not in LNBITS_ADMIN_USERS:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
-        )
-    return await update_nostrrelaysetlist(data)
\ No newline at end of file

From a5c6b1135c77930315a211a822ee2638a53217d3 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 19 Aug 2022 11:19:45 +0100
Subject: [PATCH 082/174] order paying works

---
 lnbits/extensions/diagonalley/crud.py         |  15 ++
 lnbits/extensions/diagonalley/tasks.py        |  19 +++
 .../templates/diagonalley/stall.html          | 146 +++++++++---------
 lnbits/extensions/diagonalley/views.py        |   4 -
 lnbits/extensions/diagonalley/views_api.py    |  17 ++
 5 files changed, 123 insertions(+), 78 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 798705bf..0a825ca3 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -275,6 +275,21 @@ async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
     )
     return Orders(**row) if row else None
 
+async def get_diagonalley_order_invoiceid(invoice_id: str) -> Optional[Orders]:
+    row = await db.fetchone(
+        "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (invoice_id,)
+    )
+    return Orders(**row) if row else None
+
+async def set_diagonalley_order_paid(payment_hash: str) -> Orders:
+    await db.execute(
+            """
+            UPDATE diagonalley.orders
+            SET paid = true
+            WHERE invoiceid = ?
+            """,
+            (payment_hash,),
+        )
 
 async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
     if isinstance(wallet_ids, str):
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/diagonalley/tasks.py
index bcbb7025..6b64203e 100644
--- a/lnbits/extensions/diagonalley/tasks.py
+++ b/lnbits/extensions/diagonalley/tasks.py
@@ -1,8 +1,12 @@
 import asyncio
 
+from loguru import logger
+
 from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
 
+from .crud import get_diagonalley_order_invoiceid, set_diagonalley_order_paid
+
 
 async def wait_for_paid_invoices():
     invoice_queue = asyncio.Queue()
@@ -14,6 +18,21 @@ async def wait_for_paid_invoices():
 
 
 async def on_invoice_paid(payment: Payment) -> None:
+    if payment.extra.get("tag") != "diagonalley":
+        return
+
+    order = await get_diagonalley_order_invoiceid(payment.payment_hash)
+    if not order:
+        logger.error("this should never happen", payment)
+        return
+
+    # set order as paid
+    await set_diagonalley_order_paid(payment.payment_hash)
+    
+    # deduct items sold from stock
+    # TODO
+
+    
     """
     if "lnticket" != payment.extra.get("tag"):
         # not a lnticket invoice
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index b33feb2a..f6333cfe 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -220,25 +220,41 @@
   <q-dialog
     v-model="qrCodeDialog.show"
     position="top"
-    @hide="qrCodeDialog.show = false"
+    @hide="closeQrCodeDialog"
   >
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card text-center">
-      <a :href="'lightning:' + qrCodeDialog.data.payment_request">
-        <q-responsive :ratio="1" class="q-mx-xs">
-          <qrcode
-            :value="qrCodeDialog.data.payment_request"
-            :options="{width: 400}"
-            class="rounded-borders"
-          ></qrcode>
-        </q-responsive>
-      </a>
-      <br />
-      <q-btn
-        outline
-        color="grey"
-        @click="copyText('lightning:' + qrCodeDialog.data.payment_request, 'Invoice copied to clipboard!')"
-        >Copy Invoice</q-btn
-      >
+    <q-card
+      v-if="!qrCodeDialog.data.payment_request"
+      class="q-pa-lg q-pt-xl lnbits__dialog-card"
+    >
+    </q-card>
+    <q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <div class="text-center q-mb-lg">
+        <a :href="'lightning:' + qrCodeDialog.data.payment_request">
+          <q-responsive :ratio="1" class="q-mx-xl">
+            <qrcode
+              :value="qrCodeDialog.data.payment_request"
+              :options="{width: 340}"
+              class="rounded-borders"
+            ></qrcode>
+          </q-responsive>
+        </a>
+      </div>
+      <div class="row q-mt-lg">
+        <q-btn
+          outline
+          color="grey"
+          @click="copyText(qrCodeDialog.data.payment_request)"
+          >Copy invoice</q-btn
+        >
+        <q-btn
+          @click="closeQrCodeDialog"
+          v-close-popup
+          flat
+          color="grey"
+          class="q-ml-auto"
+          >Close</q-btn
+        >
+      </div>
     </q-card>
   </q-dialog>
 </div>
@@ -252,9 +268,6 @@
       return {
         stall: null,
         products: [],
-        wallet: {
-          inkey: null
-        },
         searchText: null,
         cart: {
           total: 0,
@@ -271,8 +284,7 @@
             payment_request: null
           },
           show: false
-        },
-        cancelListener: () => {}
+        }
       }
     },
     computed: {
@@ -297,6 +309,10 @@
       }
     },
     methods: {
+      closeQrCodeDialog() {
+        this.qrCodeDialog.dismissMsg()
+        this.qrCodeDialog.show = false
+      },
       resetCart() {
         this.cart = {
           total: 0,
@@ -341,16 +357,10 @@
             return {product_id: p[0], quantity: p[1].quantity}
           })
         }
-
         LNbits.api
-          .request(
-            'POST',
-            '/diagonalley/api/v1/orders',
-            this.wallet.inkey,
-            data
-          )
+          .request('POST', '/diagonalley/api/v1/orders', null, data)
           .then(res => {
-            this.checkoutDialog = {show: false}
+            this.checkoutDialog = {show: false, data: {}}
 
             return res.data
           })
@@ -358,48 +368,46 @@
             this.qrCodeDialog.data = data
             this.qrCodeDialog.show = true
 
-            qrCodeDialog.dismissMsg = this.$q.notify({
+            this.qrCodeDialog.dismissMsg = this.$q.notify({
               timeout: 0,
               message: 'Waiting for payment...'
             })
+            return data
+          })
+          .then(data => {
+            this.qrCodeDialog.paymentChecker = setInterval(() => {
+              LNbits.api
+                .request(
+                  'GET',
+                  `/diagonalley/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
+                )
+                .then(res => {
+                  if (res.data.paid) {
+                    this.$q.notify({
+                      type: 'positive',
+                      message: 'Sats received, thanks!',
+                      icon: 'thumb_up'
+                    })
+                    clearInterval(this.qrCodeDialog.paymentChecker)
+                    this.resetCart()
+                    this.closeQrCodeDialog()
+                  }
+                })
+                .catch(error => {
+                  console.error(error)
+                  LNbits.utils.notifyApiError(error)
+                })
+            }, 3000)
+          })
+          .catch(error => {
+            console.error(error)
+            LNbits.utils.notifyApiError(error)
           })
-          .catch(error => LNbits.utils.notifyApiError(error))
-
-        return
-      },
-      startPaymentNotifier() {
-        this.cancelListener()
-
-        this.cancelListener = LNbits.events.onInvoicePaid(
-          this.wallet,
-          payment => {
-            this.qrCodeDialog = {
-              show: false,
-              data: {
-                payment_request: null
-              }
-            }
-
-            this.checkoutDialog = {data: {}}
-            this.resetCart()
-
-            this.$q.notify({
-              type: 'positive',
-              message: 'Sent, thank you!',
-              icon: 'thumb_up'
-            })
-          }
-        )
       }
     },
     created() {
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = JSON.parse('{{ products | tojson }}')
-      this.wallet.inkey = '{{ inkey }}'
-
-      this.startPaymentNotifier()
-      //let stall_ids = new Set()
-      //this.products.map(p => stall_ids.add(p.stall))
 
       console.log(this.stall, this.products)
     }
@@ -410,13 +418,3 @@
   }
 </style>
 {% endblock %}
-
-<!-- <pre id="json"></pre>
-
-<script>
-  document.getElementById('json').innerHTML = JSON.stringify(
-    '{{ stall }}',
-    null,
-    2
-  )
-</script> -->
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index c440d2ae..af93d60c 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -33,15 +33,12 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 async def display(request: Request, stall_id):
     stall = await get_diagonalley_stall(stall_id)
     products = await get_diagonalley_products(stall_id)
-    wallet = await get_wallet(stall.wallet)
     zones = []
     for id in stall.shippingzones.split(","):
         z = await get_diagonalley_zone(id)
         z = z.dict()
         zones.append({"label": z["countries"], "cost": z["cost"], "value": z["id"]})
 
-    logger.debug(f"ZONES {zones}")
-
     if not stall:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
@@ -57,7 +54,6 @@ async def display(request: Request, stall_id):
             "request": request,
             "stall": stall,
             "products": [product.dict() for product in products],
-            "inkey": wallet.inkey,
         },
     )
 
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 5bdd3c2a..4236d742 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -10,6 +10,7 @@ from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
+from lnbits.core.views.api import api_payment
 from lnbits.decorators import (
     WalletTypeInfo,
     get_key_type,
@@ -33,6 +34,7 @@ from .crud import (
     get_diagonalley_markets,
     get_diagonalley_order,
     get_diagonalley_order_details,
+    get_diagonalley_order_invoiceid,
     get_diagonalley_orders,
     get_diagonalley_product,
     get_diagonalley_products,
@@ -270,6 +272,21 @@ async def api_diagonalley_order_create(data: createOrder):
     # return order.dict()
 
 
+@diagonalley_ext.get("/api/v1/orders/payments/{payment_hash}")
+async def api_diagonalley_check_payment(payment_hash: str):
+    order = await get_diagonalley_order_invoiceid(payment_hash)
+    if not order:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Order does not exist."
+        )
+    try:
+        status = await api_payment(payment_hash)
+
+    except Exception as exc:
+        logger.error(exc)
+        return {"paid": False}
+    return status
+
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
 async def api_diagonalley_order_delete(
     order_id: str, wallet: WalletTypeInfo = Depends(get_key_type)

From 7c8e3de261d49f5600e4b900249528c3dcdafc10 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 19 Aug 2022 13:24:18 +0100
Subject: [PATCH 083/174] update product stock tests

---
 lnbits/extensions/diagonalley/crud.py  | 19 ++++++++++++++++---
 lnbits/extensions/diagonalley/tasks.py | 15 +--------------
 lnbits/extensions/diagonalley/views.py | 10 +++++++++-
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 0a825ca3..402fb1f5 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -1,10 +1,7 @@
-import re
 from base64 import urlsafe_b64encode
 from typing import List, Optional, Union
 from uuid import uuid4
 
-import httpx
-
 # from lnbits.db import open_ext_db
 from lnbits.db import SQLITE
 from lnbits.helpers import urlsafe_short_hash
@@ -291,6 +288,22 @@ async def set_diagonalley_order_paid(payment_hash: str) -> Orders:
             (payment_hash,),
         )
 
+async def update_diagonalley_product_stock(products):
+    
+    q = "\n".join([f"""WHEN id='{p["product_id"]}' THEN {p["quantity"]}""" for p in products])
+    v = ",".join(["?"] * len(products))
+    
+    await db.execute(
+        f"""
+            UPDATE diagonalley.products
+            SET quantity=(CASE
+                        {q}
+                        END)
+            WHERE id IN ({v});
+        """,
+        (*[p["product_id"] for p in products],)
+    )
+
 async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
     if isinstance(wallet_ids, str):
         wallet_ids = [wallet_ids]
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/diagonalley/tasks.py
index 6b64203e..22ce0819 100644
--- a/lnbits/extensions/diagonalley/tasks.py
+++ b/lnbits/extensions/diagonalley/tasks.py
@@ -30,19 +30,6 @@ async def on_invoice_paid(payment: Payment) -> None:
     await set_diagonalley_order_paid(payment.payment_hash)
     
     # deduct items sold from stock
+    
     # TODO
 
-    
-    """
-    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)
-    """
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index af93d60c..df65c541 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -17,6 +17,7 @@ from .crud import (
     get_diagonalley_stall,
     get_diagonalley_zone,
     get_diagonalley_zones,
+    update_diagonalley_product_stock,
 )
 
 templates = Jinja2Templates(directory="templates")
@@ -31,6 +32,13 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 @diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
+    # test_qty = 99    
+    # test = [
+    #     {"product_id": "55vpVjWAuQExHsJxT28MYe", "quantity": test_qty},
+    #     {"product_id": "f2eGNsEWgbLJbfAApd3Jw5", "quantity": test_qty},
+    #     {"product_id": "FVqZLZdemWCsiqe9gafvsC", "quantity": test_qty},
+    # ]    
+    # await update_diagonalley_product_stock(test)
     stall = await get_diagonalley_stall(stall_id)
     products = await get_diagonalley_products(stall_id)
     zones = []
@@ -43,7 +51,7 @@ async def display(request: Request, stall_id):
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
         )
-
+    
     stall = stall.dict()
     del stall["privatekey"]
     stall["zones"] = zones

From c9884e512bbd1d4414b705e23b6787c683d61c12 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Sat, 20 Aug 2022 08:18:28 +0100
Subject: [PATCH 084/174] stock values update

---
 lnbits/extensions/diagonalley/crud.py  |  4 ++--
 lnbits/extensions/diagonalley/tasks.py | 10 ++++++++--
 lnbits/extensions/diagonalley/views.py |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 402fb1f5..557b45d2 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -290,7 +290,7 @@ async def set_diagonalley_order_paid(payment_hash: str) -> Orders:
 
 async def update_diagonalley_product_stock(products):
     
-    q = "\n".join([f"""WHEN id='{p["product_id"]}' THEN {p["quantity"]}""" for p in products])
+    q = "\n".join([f"""WHEN id='{p.product_id}' THEN quantity - {p.quantity}""" for p in products])
     v = ",".join(["?"] * len(products))
     
     await db.execute(
@@ -301,7 +301,7 @@ async def update_diagonalley_product_stock(products):
                         END)
             WHERE id IN ({v});
         """,
-        (*[p["product_id"] for p in products],)
+        (*[p.product_id for p in products],)
     )
 
 async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/diagonalley/tasks.py
index 22ce0819..b913ae60 100644
--- a/lnbits/extensions/diagonalley/tasks.py
+++ b/lnbits/extensions/diagonalley/tasks.py
@@ -5,7 +5,12 @@ from loguru import logger
 from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
 
-from .crud import get_diagonalley_order_invoiceid, set_diagonalley_order_paid
+from .crud import (
+    get_diagonalley_order_details,
+    get_diagonalley_order_invoiceid,
+    set_diagonalley_order_paid,
+    update_diagonalley_product_stock,
+)
 
 
 async def wait_for_paid_invoices():
@@ -30,6 +35,7 @@ async def on_invoice_paid(payment: Payment) -> None:
     await set_diagonalley_order_paid(payment.payment_hash)
     
     # deduct items sold from stock
+    details = await get_diagonalley_order_details(order.id)
+    await update_diagonalley_product_stock(details)
     
-    # TODO
 
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index df65c541..e2905b62 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -32,7 +32,7 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 @diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
-    # test_qty = 99    
+    # test_qty = 10    
     # test = [
     #     {"product_id": "55vpVjWAuQExHsJxT28MYe", "quantity": test_qty},
     #     {"product_id": "f2eGNsEWgbLJbfAApd3Jw5", "quantity": test_qty},

From 108e2f579db3d9e0ed6af32fa69d6dca994e0588 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 12 Sep 2022 10:20:58 +0100
Subject: [PATCH 085/174] ui cosmetic on cards

---
 lnbits/extensions/diagonalley/templates/diagonalley/stall.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index f6333cfe..9396d663 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -130,11 +130,10 @@
           >
         </div>
         <div
-          v-if="item.description"
           class="text-caption text-grey ellipsis-2-lines"
           style="min-height: 40px"
         >
-          {{ item.description }}
+          <p v-if="item.description">{{ item.description }}</p>
         </div>
       </q-card-section>
 

From 6ef7411999d43565a7a3f597e66dc541b512aa84 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 12 Sep 2022 10:21:17 +0100
Subject: [PATCH 086/174] clean up

---
 lnbits/extensions/diagonalley/views.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index e2905b62..0388c285 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -32,13 +32,6 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 @diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
-    # test_qty = 10    
-    # test = [
-    #     {"product_id": "55vpVjWAuQExHsJxT28MYe", "quantity": test_qty},
-    #     {"product_id": "f2eGNsEWgbLJbfAApd3Jw5", "quantity": test_qty},
-    #     {"product_id": "FVqZLZdemWCsiqe9gafvsC", "quantity": test_qty},
-    # ]    
-    # await update_diagonalley_product_stock(test)
     stall = await get_diagonalley_stall(stall_id)
     products = await get_diagonalley_products(stall_id)
     zones = []

From f429037d636fd9e6a1d3f7f2100339afe6db9690 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 12 Sep 2022 16:58:56 +0100
Subject: [PATCH 087/174] create marketplace with stalls

---
 lnbits/extensions/diagonalley/crud.py         | 50 ++++++++++++++-
 lnbits/extensions/diagonalley/models.py       |  3 +
 .../templates/diagonalley/index.html          | 61 +++++++++++--------
 lnbits/extensions/diagonalley/views_api.py    |  5 +-
 4 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 557b45d2..664dcb06 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -9,6 +9,8 @@ from lnbits.settings import WALLET
 
 from . import db
 from .models import (
+    CreateMarket,
+    CreateMarketStalls,
     Market,
     OrderDetail,
     Orders,
@@ -332,11 +334,55 @@ async def get_diagonalley_market(market_id: str) -> Optional[Market]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.markets WHERE id = ?", (market_id,)
     )
-    Market(**row) if row else None
+    return Market(**row) if row else None
 
 
 async def get_diagonalley_market_stalls(market_id: str):
     rows = await db.fetchall(
         "SELECT * FROM diagonalley.market_stalls WHERE marketid = ?", (market_id,)
     )
-    return [Stalls(**row) for row in rows]
+
+    return [{**row} for row in rows]
+
+async def create_diagonalley_market(data: CreateMarket):
+    market_id = urlsafe_short_hash()
+
+    await db.execute(
+            """
+            INSERT INTO diagonalley.markets (id, usr, name)
+            VALUES (?, ?, ?)
+            """,
+            (
+                market_id,
+                data.usr,
+                data.name,
+            ),
+        )
+    market = await get_diagonalley_market(market_id)
+    assert market, "Newly created market couldn't be retrieved"
+    return market
+
+
+async def create_diagonalley_market_stalls(
+    market_id: str, data: List[CreateMarketStalls]
+):
+    for stallid in data:
+        id = urlsafe_short_hash()
+
+        await db.execute(
+            """
+            INSERT INTO diagonalley.market_stalls (id, marketid, stallid)
+            VALUES (?, ?, ?)
+            """,
+            (
+                id,
+                market_id,
+                stallid,
+            ),
+        )
+    market_stalls = await get_diagonalley_market_stalls(market_id)
+    return market_stalls
+
+
+async def update_diagonalley_market(market_id):
+    pass
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index e6516037..0c32798c 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -103,3 +103,6 @@ class Market(BaseModel):
     id: str
     usr: str
     name: Optional[str]
+
+class CreateMarketStalls(BaseModel):
+    stallid: str
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 516544ea..8d812a4a 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -179,12 +179,12 @@
       </q-form>
     </q-card>
   </q-dialog>
-  <!-- SHOP DIALOG -->
+  <!-- MARKETPLACE/SHOP DIALOG -->
   <q-dialog v-model="marketDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
-      <q-form @submit="sendShopFormData" class="q-gutter-md">
+      <q-form @submit="sendMarketplaceFormData" class="q-gutter-md">
         <q-toggle
-          label="Activate shop"
+          label="Activate marketplace"
           color="primary"
           v-model="marketDialog.data.activate"
         ></q-toggle>
@@ -197,13 +197,19 @@
           label="Stalls"
           v-model.trim="marketDialog.data.stalls"
         ></q-select>
+        <q-input
+          filled
+          dense
+          v-model.trim="marketDialog.data.name"
+          label="Name"
+        ></q-input>
         <div class="row q-mt-lg">
           <q-btn
             v-if="marketDialog.data.id"
             unelevated
             color="primary"
             type="submit"
-            >Update Relay</q-btn
+            >Update Marketplace</q-btn
           >
           <q-btn
             v-else
@@ -212,7 +218,7 @@
             :disable="marketDialog.data.activate == null
               || marketDialog.data.stalls == null"
             type="submit"
-            >Launch</q-btn
+            >Launch Marketplace</q-btn
           >
 
           <q-btn
@@ -368,7 +374,7 @@
           >+ Store
           <q-tooltip> Create a store to list products on </q-tooltip></q-btn
         >
-        <q-btn unelevated color="primary" @click="shopDialog.show = true"
+        <q-btn unelevated color="primary" @click="marketDialog.show = true"
           >Launch frontend shop (not Nostr)
           <q-tooltip>
             Makes a simple frontend shop for your stalls</q-tooltip
@@ -809,6 +815,11 @@
     return obj
   }
 
+  const mapMarkets = obj => {
+    obj._data = _.clone(obj)
+    return obj
+  }
+
   const humanReadableZones = zones => {
     return zones.map(z => `${z.id} - ${z.countries}`)
   }
@@ -1505,7 +1516,7 @@
           )
           .then(response => {
             if (response.data) {
-              this.shops = response.data.map(mapShops)
+              this.markets = response.data.map(mapMarkets)
             }
           })
           .catch(error => {
@@ -1514,12 +1525,12 @@
       },
       openShopUpdateDialog: function (linkId) {
         var self = this
-        var link = _.findWhere(self.shops, {id: linkId})
+        var link = _.findWhere(self.markets, {id: linkId})
 
-        this.shopDialog.data = _.clone(link._data)
-        this.shopDialog.show = true
+        this.marketDialog.data = _.clone(link._data)
+        this.marketDialog.show = true
       },
-      sendShopFormData: function () {
+      sendMarketplaceFormData: function () {
         let data = {...this.marketDialog.data}
 
         if (!data.usr) {
@@ -1529,7 +1540,7 @@
         if (data.id) {
           this.updateZone(data)
         } else {
-          this.createZone(data)
+          this.createMarketplace(data)
         }
       },
       updateShop: function (data) {
@@ -1539,24 +1550,24 @@
             'PUT',
             '/diagonalley/api/v1/shops' + data.id,
             _.findWhere(self.g.user.wallets, {
-              id: self.shopDialog.data.wallet
+              id: self.marketDialog.data.wallet
             }).inkey,
             _.pick(data, 'countries', 'cost')
           )
           .then(function (response) {
-            self.shops = _.reject(self.shops, function (obj) {
+            self.markets = _.reject(self.markets, function (obj) {
               return obj.id == data.id
             })
-            self.shops.push(mapShops(response.data))
-            self.shopDialog.show = false
-            self.shopDialog.data = {}
+            self.markets.push(mapShops(response.data))
+            self.marketDialog.show = false
+            self.marketDialog.data = {}
             data = {}
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
       },
-      createShop(data) {
+      createMarketplace(data) {
         LNbits.api
           .request(
             'POST',
@@ -1565,9 +1576,9 @@
             data
           )
           .then(response => {
-            this.shops.push(mapShops(response.data))
-            this.shopDialog.show = false
-            this.shopDialog.data = {}
+            this.markets.push(mapMarkets(response.data))
+            this.marketDialog.show = false
+            this.marketDialog.data = {}
             data = {}
           })
           .catch(error => {
@@ -1576,7 +1587,7 @@
       },
       deleteShop: function (shopId) {
         var self = this
-        var shop = _.findWhere(self.shops, {id: shopId})
+        var shop = _.findWhere(self.markets, {id: shopId})
 
         LNbits.utils
           .confirmDialog('Are you sure you want to delete this Shop link?')
@@ -1588,7 +1599,7 @@
                 _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
               )
               .then(function (response) {
-                self.shops = _.reject(self.shops, function (obj) {
+                self.markets = _.reject(self.markets, function (obj) {
                   return obj.id == shopId
                 })
               })
@@ -1598,7 +1609,7 @@
           })
       },
       exportShopsCSV: function () {
-        LNbits.utils.exportCSV(this.shopsTable.columns, this.shops)
+        LNbits.utils.exportCSV(this.shopsTable.columns, this.markets)
       },
       ////////////////////////////////////////
       ////////////////ORDERS//////////////////
@@ -1694,7 +1705,7 @@
         this.getProducts()
         this.getZones()
         this.getOrders()
-        //this.getMarkets() # NOT YET IMPLEMENTED
+        this.getMarkets() // NOT YET IMPLEMENTED
         this.customerKeys = [
           'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
           'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 4236d742..6226e28b 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -21,6 +21,8 @@ from lnbits.decorators import (
 from ...helpers import urlsafe_short_hash
 from . import db, diagonalley_ext
 from .crud import (
+    create_diagonalley_market,
+    create_diagonalley_market_stalls,
     create_diagonalley_order,
     create_diagonalley_order_details,
     create_diagonalley_product,
@@ -42,6 +44,7 @@ from .crud import (
     get_diagonalley_stalls,
     get_diagonalley_zone,
     get_diagonalley_zones,
+    update_diagonalley_market,
     update_diagonalley_product,
     update_diagonalley_stall,
     update_diagonalley_zone,
@@ -439,7 +442,6 @@ async def api_diagonalley_stall_create(
     market_id: str = None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
-
     if market_id:
         market = await get_diagonalley_market(market_id)
         if not market:
@@ -451,5 +453,6 @@ async def api_diagonalley_stall_create(
         market = await update_diagonalley_market(market_id, **data.dict())
     else:
         market = await create_diagonalley_market(data=data)
+        await create_diagonalley_market_stalls(market_id=market.id, data=data.stalls)
 
     return market.dict()

From 418cc7bf863b27f1d999375b21b64493feb81750 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 12 Sep 2022 17:01:41 +0100
Subject: [PATCH 088/174] make format

---
 lnbits/extensions/diagonalley/crud.py      | 35 +++++++++++++---------
 lnbits/extensions/diagonalley/models.py    |  1 +
 lnbits/extensions/diagonalley/tasks.py     |  4 +--
 lnbits/extensions/diagonalley/views.py     |  2 +-
 lnbits/extensions/diagonalley/views_api.py |  1 +
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 664dcb06..49a64fc7 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -274,27 +274,32 @@ async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
     )
     return Orders(**row) if row else None
 
+
 async def get_diagonalley_order_invoiceid(invoice_id: str) -> Optional[Orders]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (invoice_id,)
     )
     return Orders(**row) if row else None
 
+
 async def set_diagonalley_order_paid(payment_hash: str) -> Orders:
     await db.execute(
-            """
+        """
             UPDATE diagonalley.orders
             SET paid = true
             WHERE invoiceid = ?
             """,
-            (payment_hash,),
-        )
+        (payment_hash,),
+    )
+
 
 async def update_diagonalley_product_stock(products):
-    
-    q = "\n".join([f"""WHEN id='{p.product_id}' THEN quantity - {p.quantity}""" for p in products])
+
+    q = "\n".join(
+        [f"""WHEN id='{p.product_id}' THEN quantity - {p.quantity}""" for p in products]
+    )
     v = ",".join(["?"] * len(products))
-    
+
     await db.execute(
         f"""
             UPDATE diagonalley.products
@@ -303,9 +308,10 @@ async def update_diagonalley_product_stock(products):
                         END)
             WHERE id IN ({v});
         """,
-        (*[p.product_id for p in products],)
+        (*[p.product_id for p in products],),
     )
 
+
 async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
     if isinstance(wallet_ids, str):
         wallet_ids = [wallet_ids]
@@ -344,20 +350,21 @@ async def get_diagonalley_market_stalls(market_id: str):
 
     return [{**row} for row in rows]
 
+
 async def create_diagonalley_market(data: CreateMarket):
     market_id = urlsafe_short_hash()
 
     await db.execute(
-            """
+        """
             INSERT INTO diagonalley.markets (id, usr, name)
             VALUES (?, ?, ?)
             """,
-            (
-                market_id,
-                data.usr,
-                data.name,
-            ),
-        )
+        (
+            market_id,
+            data.usr,
+            data.name,
+        ),
+    )
     market = await get_diagonalley_market(market_id)
     assert market, "Newly created market couldn't be retrieved"
     return market
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index 0c32798c..c3234bb6 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -104,5 +104,6 @@ class Market(BaseModel):
     usr: str
     name: Optional[str]
 
+
 class CreateMarketStalls(BaseModel):
     stallid: str
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/diagonalley/tasks.py
index b913ae60..cd9e18a8 100644
--- a/lnbits/extensions/diagonalley/tasks.py
+++ b/lnbits/extensions/diagonalley/tasks.py
@@ -33,9 +33,7 @@ async def on_invoice_paid(payment: Payment) -> None:
 
     # set order as paid
     await set_diagonalley_order_paid(payment.payment_hash)
-    
+
     # deduct items sold from stock
     details = await get_diagonalley_order_details(order.id)
     await update_diagonalley_product_stock(details)
-    
-
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 0388c285..5a94d993 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -44,7 +44,7 @@ async def display(request: Request, stall_id):
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
         )
-    
+
     stall = stall.dict()
     del stall["privatekey"]
     stall["zones"] = zones
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 6226e28b..0e69e637 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -290,6 +290,7 @@ async def api_diagonalley_check_payment(payment_hash: str):
         return {"paid": False}
     return status
 
+
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
 async def api_diagonalley_order_delete(
     order_id: str, wallet: WalletTypeInfo = Depends(get_key_type)

From 6a5c0bd8ee3bcb66acbb79292e1aca997b49ffd9 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 13 Sep 2022 12:52:26 +0100
Subject: [PATCH 089/174] list marketplaces with stalls in index.html

---
 lnbits/extensions/diagonalley/crud.py         |  13 +-
 .../templates/diagonalley/index.html          | 113 ++++++++++++++++++
 lnbits/extensions/diagonalley/views_api.py    |  12 +-
 3 files changed, 135 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 49a64fc7..b2689f21 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -201,6 +201,13 @@ async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stal
     )
     return [Stalls(**row) for row in rows]
 
+async def get_diagonalley_stalls_by_ids(stall_ids: Union[str, List[str]]) -> List[Stalls]:
+    q = ",".join(["?"] * len(stall_ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.stalls WHERE id IN ({q})", (*stall_ids,)
+    )
+    return [Stalls(**row) for row in rows]    
+
 
 async def delete_diagonalley_stall(stall_id: str) -> None:
     await db.execute("DELETE FROM diagonalley.stalls WHERE id = ?", (stall_id,))
@@ -346,9 +353,11 @@ async def get_diagonalley_market(market_id: str) -> Optional[Market]:
 async def get_diagonalley_market_stalls(market_id: str):
     rows = await db.fetchall(
         "SELECT * FROM diagonalley.market_stalls WHERE marketid = ?", (market_id,)
-    )
+    )   
 
-    return [{**row} for row in rows]
+    ids =  [row["stallid"] for row in rows]
+    
+    return await get_diagonalley_stalls_by_ids(ids)
 
 
 async def create_diagonalley_market(data: CreateMarket):
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 8d812a4a..a8062910 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -669,6 +669,80 @@
       </q-card-section>
     </q-card>
 
+    <q-card v-if="markets.length">
+      <!-- MARKETPLACES TABLE -->
+      <q-card-section>
+        <div class="row items-center no-wrap q-mb-md">
+          <div class="col">
+            <h5 class="text-subtitle1 q-my-none">Marketplaces</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportStallsCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="markets"
+          row-key="id"
+          :columns="marketTable.columns"
+          :pagination.sync="marketTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width></q-th>
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </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="storefront"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  type="a"
+                  :href="'/diagonalley/' + props.row.id"
+                  target="_blank"
+                ></q-btn>
+                <q-tooltip> Link to pass to stall relay </q-tooltip>
+              </q-td>
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openStallUpdateDialog(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteStall(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </q-card-section>
+    </q-card>
+
     <q-card>
       <!-- ZONES TABLE -->
       <q-card-section>
@@ -817,6 +891,17 @@
 
   const mapMarkets = obj => {
     obj._data = _.clone(obj)
+    obj.stores = []
+    LNbits.api
+      .request('GET', `/diagonalley/api/v1/markets/${obj.id}/stalls`, null)
+      .then(response => {
+        if (response.data) {
+          obj.stores = response.data.map(s => s.name).toString()
+        }
+      })
+      .catch(error => {
+        LNbits.utils.notifyApiError(error)
+      })
     return obj
   }
 
@@ -832,6 +917,7 @@
         products: [],
         orders: [],
         stalls: [],
+        markets: [],
         zones: [],
         zoneOptions: [],
         customerKeys: [],
@@ -1015,6 +1101,31 @@
             rowsPerPage: 10
           }
         },
+        marketTable: {
+          columns: [
+            {
+              name: 'id',
+              align: 'left',
+              label: 'ID',
+              field: 'id'
+            },
+            {
+              name: 'name',
+              align: 'left',
+              label: 'Name',
+              field: 'name'
+            },
+            {
+              name: 'stores',
+              align: 'left',
+              label: 'Stores',
+              field: 'stores'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        },
         zonesTable: {
           columns: [
             {
@@ -1517,12 +1628,14 @@
           .then(response => {
             if (response.data) {
               this.markets = response.data.map(mapMarkets)
+              console.log(this.markets)
             }
           })
           .catch(error => {
             LNbits.utils.notifyApiError(error)
           })
       },
+
       openShopUpdateDialog: function (linkId) {
         var self = this
         var link = _.findWhere(self.markets, {id: linkId})
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 0e69e637..947538c8 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -1,5 +1,6 @@
 from base64 import urlsafe_b64encode
 from http import HTTPStatus
+from typing import List
 from uuid import uuid4
 
 from fastapi import Request
@@ -33,6 +34,7 @@ from .crud import (
     delete_diagonalley_stall,
     delete_diagonalley_zone,
     get_diagonalley_market,
+    get_diagonalley_market_stalls,
     get_diagonalley_markets,
     get_diagonalley_order,
     get_diagonalley_order_details,
@@ -42,6 +44,7 @@ from .crud import (
     get_diagonalley_products,
     get_diagonalley_stall,
     get_diagonalley_stalls,
+    get_diagonalley_stalls_by_ids,
     get_diagonalley_zone,
     get_diagonalley_zones,
     update_diagonalley_market,
@@ -426,7 +429,8 @@ async def api_diagonalley_stall_order(
 
 
 @diagonalley_ext.get("/api/v1/markets")
-async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type)):
+async def api_diagonalley_markets(wallet: WalletTypeInfo = Depends(get_key_type)):
+    # await get_diagonalley_market_stalls(market_id="FzpWnMyHQMcRppiGVua4eY")
     try:
         return [
             market.dict()
@@ -436,6 +440,12 @@ async def api_diagonalley_orders(wallet: WalletTypeInfo = Depends(get_key_type))
         return {"message": "We could not retrieve the markets."}
 
 
+@diagonalley_ext.get("/api/v1/markets/{market_id}/stalls")
+async def api_diagonalley_market_stalls(market_id: str):
+    stall_ids = await get_diagonalley_market_stalls(market_id)
+    return stall_ids
+    
+
 @diagonalley_ext.post("/api/v1/markets")
 @diagonalley_ext.put("/api/v1/markets/{market_id}")
 async def api_diagonalley_stall_create(

From ad98cb0d45dd466e2009f5921f4d31dc1b18f14f Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 15 Sep 2022 15:51:12 +0100
Subject: [PATCH 090/174] marketplace html skeleton

---
 .../templates/diagonalley/index.html          |   2 +-
 .../templates/diagonalley/market.html         | 419 ++++++++++++++++++
 lnbits/extensions/diagonalley/views.py        |  39 +-
 3 files changed, 443 insertions(+), 17 deletions(-)
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/market.html

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index a8062910..c951fb0a 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1818,7 +1818,7 @@
         this.getProducts()
         this.getZones()
         this.getOrders()
-        this.getMarkets() // NOT YET IMPLEMENTED
+        this.getMarkets()
         this.customerKeys = [
           'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
           'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/market.html b/lnbits/extensions/diagonalley/templates/diagonalley/market.html
new file mode 100644
index 00000000..b1a3ce88
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/market.html
@@ -0,0 +1,419 @@
+{% extends "public.html" %} {% block page %}
+<div class="row q-mb-md">
+  <div class="col-12 q-gutter-y-md">
+    <q-toolbar class="row">
+      <div class="col">
+        <q-toolbar-title> {{ market.name }} </q-toolbar-title>
+      </div>
+      <div class="col q-mx-md">
+        <q-input
+          class="float-left full-width q-ml-md"
+          standout
+          square
+          dense
+          outlined
+          clearable
+          v-model.trim="searchText"
+          label="Search for products"
+        >
+          <template v-slot:append>
+            <q-icon v-if="!searchText" name="search" />
+          </template>
+        </q-input>
+      </div>
+      <q-btn dense round flat icon="shopping_cart">
+        {% raw %}
+        <q-badge v-if="cart.size" color="red" class="text-bold" floating>
+          {{ cart.size }}
+        </q-badge>
+        {% endraw %}
+        <q-menu auto-close v-if="cart.size">
+          <q-list style="min-width: 100px">
+            {% raw %}
+            <q-item clickable :key="p.id" v-for="p in cartMenu">
+              <q-item-section side>
+                <span>{{p.quantity}} x </span>
+              </q-item-section>
+              <q-item-section avatar>
+                <q-avatar color="primary">
+                  <img
+                    size="sm"
+                    :src="products.find(f => f.id == p.id).image"
+                  />
+                </q-avatar>
+              </q-item-section>
+
+              <q-item-section>
+                <q-item-label>{{ p.name }}</q-item-label>
+              </q-item-section>
+
+              <q-item-section side>
+                <span> {{p.price}} sats</span>
+              </q-item-section>
+            </q-item>
+            {% endraw %}
+            <q-separator />
+          </q-list>
+          <div class="q-pa-md q-gutter-md">
+            <q-btn
+              color="primary"
+              icon-right="checkout"
+              label="Checkout"
+              @click="checkoutDialog.show = true"
+            />
+          </div>
+        </q-menu>
+      </q-btn>
+    </q-toolbar>
+  </div>
+</div>
+<div class="row q-col-gutter-md">
+  <div
+    class="col-xs-12 col-sm-6 col-md-4 col-lg-3"
+    v-for="item in filterProducts"
+    :key="item.id"
+  >
+    <q-card class="card--product">
+      {% raw %}
+      <q-img
+        :src="item.image ? item.image : '/diagonalley/static/images/placeholder.png'"
+        alt="Product Image"
+        loading="lazy"
+        spinner-color="white"
+        fit="contain"
+        height="300px"
+      ></q-img>
+
+      <q-card-section class="q-pb-xs q-pt-md">
+        <q-btn
+          round
+          :disabled="item.quantity < 1"
+          color="primary"
+          icon="shopping_cart"
+          size="lg"
+          style="
+            position: absolute;
+            top: 0;
+            right: 0;
+            transform: translate(-50%, -50%);
+          "
+          @click="addToCart(item)"
+          ><q-tooltip> Add to cart </q-tooltip></q-btn
+        >
+
+        <div class="row no-wrap items-center">
+          <div class="col text-subtitle2 ellipsis-2-lines">
+            {{ item.product }}
+          </div>
+        </div>
+
+        <!-- <q-rating v-model="stars" color="orange" :max="5" readonly size="17px"></q-rating> -->
+      </q-card-section>
+
+      <q-card-section class="q-py-sm">
+        <div>
+          <!-- <div class="text-caption text-green-8 text-weight-bolder">
+            {{ stall.name }}
+          </div> -->
+          <span class="text-h6">{{ item.price }} sats</span
+          ><span class="q-ml-sm text-grey-6"
+            >BTC {{ (item.price / 1e8).toFixed(8) }}</span
+          >
+          <span
+            class="q-ml-md text-caption text-green-8 text-weight-bolder q-mt-md"
+            >{{item.quantity}} left</span
+          >
+        </div>
+        <div v-if="item.categories" class="text-subtitle1">
+          <q-chip v-for="cat in item.categories.split(',')" dense
+            >{{cat}}</q-chip
+          >
+        </div>
+        <div
+          class="text-caption text-grey ellipsis-2-lines"
+          style="min-height: 40px"
+        >
+          <p v-if="item.description">{{ item.description }}</p>
+        </div>
+      </q-card-section>
+
+      <q-separator></q-separator>
+
+      <q-card-actions>
+        <q-btn
+          flat
+          class="text-weight-bold text-capitalize"
+          dense
+          color="primary"
+        >
+          View details
+        </q-btn>
+      </q-card-actions>
+      {% endraw %}
+    </q-card>
+  </div>
+  <!-- CHECKOUT DIALOG -->
+  <q-dialog v-model="checkoutDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-form @submit="placeOrder" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="checkoutDialog.data.username"
+          label="Name *optional"
+        ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.trim="checkoutDialog.data.address"
+          label="Address"
+        ></q-input>
+        <!-- <q-input
+          filled
+          dense
+          v-model.trim="checkoutDialog.data.address_2"
+          label="Address (line 2)"
+        ></q-input> -->
+        <q-input
+          v-model="checkoutDialog.data.email"
+          filled
+          dense
+          type="email"
+          label="Email"
+        ></q-input>
+        <p>Select the shipping zone:</p>
+        <div class="row q-mt-lg">
+          <q-option-group
+            :options="stall.zones"
+            type="radio"
+            emit-value
+            v-model="checkoutDialog.data.shippingzone"
+          />
+        </div>
+        <div class="row q-mt-lg">
+          {% raw %} Total: {{ finalCost }} {% endraw %}
+        </div>
+        <div class="row q-mt-lg">
+          <q-btn
+            unelevated
+            color="primary"
+            :disable="checkoutDialog.data.address == null
+              || checkoutDialog.data.email == null
+              || checkoutDialog.data.shippingzone == null"
+            type="submit"
+            >Checkout</q-btn
+          >
+          <q-btn
+            v-close-popup
+            flat
+            @click="checkoutDialog = {show: false, data: {}}"
+            color="grey"
+            class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+  <!-- INVOICE DIALOG -->
+  <q-dialog
+    v-model="qrCodeDialog.show"
+    position="top"
+    @hide="closeQrCodeDialog"
+  >
+    <q-card
+      v-if="!qrCodeDialog.data.payment_request"
+      class="q-pa-lg q-pt-xl lnbits__dialog-card"
+    >
+    </q-card>
+    <q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <div class="text-center q-mb-lg">
+        <a :href="'lightning:' + qrCodeDialog.data.payment_request">
+          <q-responsive :ratio="1" class="q-mx-xl">
+            <qrcode
+              :value="qrCodeDialog.data.payment_request"
+              :options="{width: 340}"
+              class="rounded-borders"
+            ></qrcode>
+          </q-responsive>
+        </a>
+      </div>
+      <div class="row q-mt-lg">
+        <q-btn
+          outline
+          color="grey"
+          @click="copyText(qrCodeDialog.data.payment_request)"
+          >Copy invoice</q-btn
+        >
+        <q-btn
+          @click="closeQrCodeDialog"
+          v-close-popup
+          flat
+          color="grey"
+          class="q-ml-auto"
+          >Close</q-btn
+        >
+      </div>
+    </q-card>
+  </q-dialog>
+</div>
+{% endblock %} {% block scripts %}
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        stall: null,
+        products: [],
+        searchText: null,
+        cart: {
+          total: 0,
+          size: 0,
+          products: new Map()
+        },
+        cartMenu: [],
+        checkoutDialog: {
+          show: false,
+          data: {}
+        },
+        qrCodeDialog: {
+          data: {
+            payment_request: null
+          },
+          show: false
+        }
+      }
+    },
+    computed: {
+      filterProducts() {
+        if (!this.searchText || this.searchText.length < 2) return this.products
+        return this.products.filter(p => {
+          return (
+            p.product.includes(this.searchText) ||
+            p.description.includes(this.searchText) ||
+            p.categories.includes(this.searchText)
+          )
+        })
+      },
+      finalCost() {
+        if (!this.checkoutDialog.data.shippingzone) return this.cart.total
+
+        let zoneCost = this.stall.zones.find(
+          z => z.value == this.checkoutDialog.data.shippingzone
+        )
+
+        return this.cart.total + zoneCost.cost
+      }
+    },
+    methods: {
+      closeQrCodeDialog() {
+        this.qrCodeDialog.dismissMsg()
+        this.qrCodeDialog.show = false
+      },
+      resetCart() {
+        this.cart = {
+          total: 0,
+          size: 0,
+          products: new Map()
+        }
+      },
+      addToCart(item) {
+        let prod = this.cart.products
+        if (prod.has(item.id)) {
+          let qty = prod.get(item.id).quantity
+          prod.set(item.id, {
+            ...prod.get(item.id),
+            quantity: qty + 1
+          })
+        } else {
+          prod.set(item.id, {
+            name: item.product,
+            quantity: 1,
+            price: item.price
+          })
+        }
+        this.cart.products = prod
+        this.updateCart(item.price)
+      },
+      removeFromCart() {},
+      updateCart(price) {
+        this.cart.total += price
+        this.cart.size++
+        this.cartMenu = Array.from(this.cart.products, item => {
+          return {id: item[0], ...item[1]}
+        })
+        console.log(this.cartMenu, this.cart)
+      },
+      placeOrder() {
+        let dialog = this.checkoutDialog.data
+        let data = {
+          ...this.checkoutDialog.data,
+          wallet: this.stall.wallet,
+          total: this.finalCost,
+          products: Array.from(this.cart.products, p => {
+            return {product_id: p[0], quantity: p[1].quantity}
+          })
+        }
+        LNbits.api
+          .request('POST', '/diagonalley/api/v1/orders', null, data)
+          .then(res => {
+            this.checkoutDialog = {show: false, data: {}}
+
+            return res.data
+          })
+          .then(data => {
+            this.qrCodeDialog.data = data
+            this.qrCodeDialog.show = true
+
+            this.qrCodeDialog.dismissMsg = this.$q.notify({
+              timeout: 0,
+              message: 'Waiting for payment...'
+            })
+            return data
+          })
+          .then(data => {
+            this.qrCodeDialog.paymentChecker = setInterval(() => {
+              LNbits.api
+                .request(
+                  'GET',
+                  `/diagonalley/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
+                )
+                .then(res => {
+                  if (res.data.paid) {
+                    this.$q.notify({
+                      type: 'positive',
+                      message: 'Sats received, thanks!',
+                      icon: 'thumb_up'
+                    })
+                    clearInterval(this.qrCodeDialog.paymentChecker)
+                    this.resetCart()
+                    this.closeQrCodeDialog()
+                  }
+                })
+                .catch(error => {
+                  console.error(error)
+                  LNbits.utils.notifyApiError(error)
+                })
+            }, 3000)
+          })
+          .catch(error => {
+            console.error(error)
+            LNbits.utils.notifyApiError(error)
+          })
+      }
+    },
+    created() {
+      this.stall = JSON.parse('{{ stalls | tojson }}')
+      this.products = JSON.parse('{{ products | tojson }}')
+
+      console.log(this.stall, this.products)
+    }
+  })
+</script>
+<style scoped>
+  .card--product {
+  }
+</style>
+{% endblock %}
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 5a94d993..4e1db476 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -13,6 +13,8 @@ from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
 
 from ...core.crud import get_wallet
 from .crud import (
+    get_diagonalley_market,
+    get_diagonalley_market_stalls,
     get_diagonalley_products,
     get_diagonalley_stall,
     get_diagonalley_zone,
@@ -59,20 +61,25 @@ async def display(request: Request, stall_id):
     )
 
 
-# @diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
-# async def display(request: Request, stall_id):
-#     stalls = await get_diagonalley_stall(stall_id)
-#     products = await get_diagonalley_products(stall_id)
+@diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
+async def display(request: Request, market_id):
+    market = await get_diagonalley_market(market_id)
+    
+    if not market:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Marketplace doesn't exist."
+        )
+    
+    stalls = await get_diagonalley_market_stalls(market_id)
+    stalls_ids = [stall.id for stall in stalls]
+    products = [product.dict() for product in await get_diagonalley_products(stalls_ids)]
 
-#     if not stall:
-#         raise HTTPException(
-#             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
-#         )
-#     return diagonalley_renderer().TemplateResponse(
-#         "diagonalley/stall.html",
-#         {
-#             "request": request,
-#             "stall": stall.dict(),
-#             "products": [product.dict() for product in products]
-#         },
-#     )
+    return diagonalley_renderer().TemplateResponse(
+        "diagonalley/market.html",
+        {
+            "request": request,
+            "market": market,
+            "stalls": [stall.dict() for stall in stalls],
+            "products": products
+        },
+    )

From ee4757543123c6b96772b4862a01dd0216ce2381 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 15 Sep 2022 15:52:08 +0100
Subject: [PATCH 091/174] format

---
 lnbits/extensions/diagonalley/crud.py      | 13 ++++++++-----
 lnbits/extensions/diagonalley/views.py     | 10 ++++++----
 lnbits/extensions/diagonalley/views_api.py |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index b2689f21..8f053de1 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -201,12 +201,15 @@ async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stal
     )
     return [Stalls(**row) for row in rows]
 
-async def get_diagonalley_stalls_by_ids(stall_ids: Union[str, List[str]]) -> List[Stalls]:
+
+async def get_diagonalley_stalls_by_ids(
+    stall_ids: Union[str, List[str]]
+) -> List[Stalls]:
     q = ",".join(["?"] * len(stall_ids))
     rows = await db.fetchall(
         f"SELECT * FROM diagonalley.stalls WHERE id IN ({q})", (*stall_ids,)
     )
-    return [Stalls(**row) for row in rows]    
+    return [Stalls(**row) for row in rows]
 
 
 async def delete_diagonalley_stall(stall_id: str) -> None:
@@ -353,10 +356,10 @@ async def get_diagonalley_market(market_id: str) -> Optional[Market]:
 async def get_diagonalley_market_stalls(market_id: str):
     rows = await db.fetchall(
         "SELECT * FROM diagonalley.market_stalls WHERE marketid = ?", (market_id,)
-    )   
+    )
+
+    ids = [row["stallid"] for row in rows]
 
-    ids =  [row["stallid"] for row in rows]
-    
     return await get_diagonalley_stalls_by_ids(ids)
 
 
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 4e1db476..d0fee249 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -64,15 +64,17 @@ async def display(request: Request, stall_id):
 @diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
 async def display(request: Request, market_id):
     market = await get_diagonalley_market(market_id)
-    
+
     if not market:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Marketplace doesn't exist."
         )
-    
+
     stalls = await get_diagonalley_market_stalls(market_id)
     stalls_ids = [stall.id for stall in stalls]
-    products = [product.dict() for product in await get_diagonalley_products(stalls_ids)]
+    products = [
+        product.dict() for product in await get_diagonalley_products(stalls_ids)
+    ]
 
     return diagonalley_renderer().TemplateResponse(
         "diagonalley/market.html",
@@ -80,6 +82,6 @@ async def display(request: Request, market_id):
             "request": request,
             "market": market,
             "stalls": [stall.dict() for stall in stalls],
-            "products": products
+            "products": products,
         },
     )
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 947538c8..f5751553 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -444,7 +444,7 @@ async def api_diagonalley_markets(wallet: WalletTypeInfo = Depends(get_key_type)
 async def api_diagonalley_market_stalls(market_id: str):
     stall_ids = await get_diagonalley_market_stalls(market_id)
     return stall_ids
-    
+
 
 @diagonalley_ext.post("/api/v1/markets")
 @diagonalley_ext.put("/api/v1/markets/{market_id}")

From e80daf27957b315676f51f39059e4f3488029e03 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 23 Sep 2022 10:25:57 +0100
Subject: [PATCH 092/174] rename stores to stalls

---
 .../templates/diagonalley/index.html          | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index c951fb0a..eb290a92 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -314,7 +314,7 @@
             unelevated
             color="primary"
             type="submit"
-            >Update Store</q-btn
+            >Update Stall</q-btn
           >
           <q-btn
             v-else
@@ -323,7 +323,7 @@
             :disable="stallDialog.data.wallet == null
               || stallDialog.data.shippingzones == null"
             type="submit"
-            >Create Store</q-btn
+            >Create Stall</q-btn
           >
           <q-btn
             v-close-popup
@@ -363,21 +363,25 @@
           v-if="zones.length > 0"
           color="primary"
           @click="openStallDialog()"
-          >+ Store
-          <q-tooltip> Create a stall to list products on </q-tooltip></q-btn
+          >+ Stall
+          <q-tooltip>
+            Create a market stall to list products on
+          </q-tooltip></q-btn
         >
         <q-btn
           unelevated
           v-else
           color="primary"
           @click="errorMessage('First set shipping zone(s).')"
-          >+ Store
-          <q-tooltip> Create a store to list products on </q-tooltip></q-btn
+          >+ Stall
+          <q-tooltip>
+            Create a market stall to list products on
+          </q-tooltip></q-btn
         >
         <q-btn unelevated color="primary" @click="marketDialog.show = true"
-          >Launch frontend shop (not Nostr)
+          >Create Market
           <q-tooltip>
-            Makes a simple frontend shop for your stalls</q-tooltip
+            Makes a simple frontend shop for your stalls (not NOSTR)</q-tooltip
           ></q-btn
         >
       </q-card-section>
@@ -596,11 +600,11 @@
     </q-card>
 
     <q-card>
-      <!-- STORES TABLE -->
+      <!-- STALLS TABLE -->
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Stores</h5>
+            <h5 class="text-subtitle1 q-my-none">Market Stalls</h5>
           </div>
           <div class="col-auto">
             <q-btn flat color="grey" @click="exportStallsCSV"
@@ -1030,7 +1034,7 @@
             {
               name: 'stall',
               align: 'left',
-              label: 'Store',
+              label: 'Stall',
               field: 'stall'
             },
             {
@@ -1118,7 +1122,7 @@
             {
               name: 'stores',
               align: 'left',
-              label: 'Stores',
+              label: 'Stalls',
               field: 'stores'
             }
           ],

From aadb5677123998371a2f0c0f47a03f1ee9e7679d Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 28 Sep 2022 11:11:52 +0100
Subject: [PATCH 093/174] WIP added keys to merchant

---
 .../templates/diagonalley/index.html          | 50 ++++++++++++++-----
 lnbits/extensions/diagonalley/views_api.py    | 13 +++++
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index eb290a92..cd03e6f3 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -253,28 +253,32 @@
         >
         </q-select>
         <!-- NOSTR -->
-        <!-- <div class="row">
+        <div class="row">
           <div class="col-5">
-            <q-btn unelevated @onclick="generateKeys" color="primary">Generate keys</q-btn>
+            <q-btn unelevated @click="generateKeys" color="primary"
+              >Generate keys</q-btn
+            >
           </div>
           <div class="col-5">
-            <q-btn unelevated @onclick="restoreKeys" color="primary">Restore keys</q-btn>
+            <q-btn unelevated @click="restoreKeys" color="primary"
+              >Restore keys</q-btn
+            >
           </div>
         </div>
         <q-input
-          v-if="stallDialog.restorekeys"
+          v-if="keys"
           filled
           dense
           v-model.trim="stallDialog.data.publickey"
           label="Public Key"
         ></q-input>
         <q-input
-          v-if="stallDialog.restorekeys"
+          v-if="keys"
           filled
           dense
           v-model.trim="stallDialog.data.privatekey"
           label="Private Key"
-        ></q-input> -->
+        ></q-input>
         <q-select
           :options="zoneOptions"
           filled
@@ -863,6 +867,7 @@
 </div> -->
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
+
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
 
@@ -918,6 +923,7 @@
     mixins: [windowMixin],
     data: function () {
       return {
+        keys: null,
         products: [],
         orders: [],
         stalls: [],
@@ -1197,24 +1203,43 @@
         this[dialog].show = false
         this[dialog].data = {}
       },
-      generateKeys: function () {
-        var self = this
+      generateKeys() {
         LNbits.api
           .request(
             'GET',
             '/diagonalley/api/v1/keys',
-            self.g.user.wallets[0].adminkey
+            this.g.user.wallets[0].adminkey
           )
-          .then(function (response) {
+          .then(response => {
             if (response.data) {
-              self.keys = response.data.map(mapKeys)
+              this.keys = response.data
+              this.stallDialog.data.publickey = this.keys.pubkey
+              this.stallDialog.data.privatekey = this.keys.privkey
+              this.$q.localStorage.set(
+                `lnbits.diagonalley.${this.g.user.id}`,
+                this.keys
+              )
             }
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
       },
-      restoreKeys: function () {},
+      restoreKeys() {
+        let keys = this.$q.localStorage.getItem(
+          `lnbits.diagonalley.${this.g.user.id}`
+        )
+        if (keys) {
+          this.keys = keys
+          this.stallDialog.data.publickey = this.keys.pubkey
+          this.stallDialog.data.privatekey = this.keys.privkey
+        } else {
+          this.$q.notify({
+            type: 'warning',
+            message: 'No keys found.'
+          })
+        }
+      },
       capitalizeFirstLetter: function (string) {
         return string.charAt(0).toUpperCase() + string.slice(1)
       },
@@ -1827,7 +1852,6 @@
           'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
           'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
         ]
-        console.log(_.pick(this.g.user, 'id'))
       }
     }
   })
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index f5751553..c3615c90 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -7,6 +7,7 @@ from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
 from loguru import logger
+from secp256k1 import PrivateKey, PublicKey
 from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
@@ -467,3 +468,15 @@ async def api_diagonalley_stall_create(
         await create_diagonalley_market_stalls(market_id=market.id, data=data.stalls)
 
     return market.dict()
+
+## KEYS
+
+@diagonalley_ext.get("/api/v1/keys")
+async def api_diagonalley_generate_keys(wallet: WalletTypeInfo = Depends(require_admin_key)):
+    private_key = PrivateKey()
+    public_key = private_key.pubkey.serialize().hex()
+    while not public_key.startswith("02"):
+        private_key = PrivateKey()
+        public_key = private_key.pubkey.serialize().hex()
+    return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}
+

From 4aa17930fdda8f77bb4833792b02862f95a14568 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 28 Sep 2022 11:12:10 +0100
Subject: [PATCH 094/174] chat page

---
 .../templates/diagonalley/chat.html           | 194 ++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/chat.html

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
new file mode 100644
index 00000000..bb3e607f
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
@@ -0,0 +1,194 @@
+{% extends "public.html" %} {% block page %}
+<div class="row q-col-gutter-md flex">
+  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
+    <q-card>
+      <div class="chat-container q-pa-md">
+        <div class="chat-box">
+          <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
+          <div class="chat-messages">
+            <q-chat-message
+              :key="key"
+              v-for="(message, key) in messages"
+              :name="message.from == 'me' ? 'me' : 'merchant'"
+              :text="[message.text]"
+              :sent="message.from == 'me' ? true : false"
+              :bg-color="message.from == 'me' ? 'white' : 'light-green-2'"
+            />
+          </div>
+        </div>
+        <q-form @submit="sendMessage" class="full-width chat-input">
+          <q-input
+            ref="newMessage"
+            v-model="newMessage"
+            placeholder="Message"
+            class="full-width"
+            dense
+            outlined
+          >
+            <template>
+              <q-btn
+                round
+                dense
+                flat
+                type="submit"
+                icon="send"
+                color="primary"
+              />
+            </template>
+          </q-input>
+        </q-form>
+      </div>
+    </q-card>
+  </div>
+  <div class="col-12 col-md-5 col-lg-6 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        {% raw %}
+        <h6 class="text-subtitle1 q-my-none">{{ stall.name }}</h6>
+        <p @click="copyText(stall.publickey)">
+          Public Key: {{ sliceKey(stall.publickey) }}
+          <q-tooltip>{{ stall.publickey }}</q-tooltip>
+        </p>
+        {% endraw %}
+        <q-form @submit="" class="q-gutter-md">
+          <q-select
+            filled
+            dense
+            emit-value
+            v-model="model"
+            :options="mockMerch"
+            label="Merchant"
+            hint="Select a merchant you've opened an order to"
+          ></q-select>
+          <br />
+          <q-select
+            filled
+            dense
+            emit-value
+            v-model="model"
+            :options="mockOrder"
+            label="Order"
+            hint="Select an order from this merchant"
+            :disabled="!this.model"
+          ></q-select>
+        </q-form>
+      </q-card-section>
+      <q-card-section>
+        <q-separator></q-separator>
+        <p>
+          Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
+          quasi.
+        </p>
+        <div class="text-center q-mb-lg">
+          <a :href="'lightning:'">
+            <q-responsive :ratio="1" class="q-mx-xl">
+              <qrcode
+                :value="cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b"
+                :options="{width: 340}"
+                class="rounded-borders"
+              ></qrcode>
+            </q-responsive>
+          </a>
+        </div>
+        <p>
+          Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
+          quasi.
+        </p>
+      </q-card-section>
+      <q-card-section>
+        <q-separator></q-separator>
+        <div class="row q-mt-lg">
+          <q-btn outline color="grey" @click=""
+            >Backup keys
+            <q-tooltip>Download your keys</q-tooltip>
+          </q-btn>
+          <q-btn @click="" v-close-popup flat color="grey" class="q-ml-auto"
+            >Delete data
+            <q-tooltip>Delete all data from browser</q-tooltip>
+          </q-btn>
+        </div>
+      </q-card-section>
+    </q-card>
+  </div>
+</div>
+{% endblock %} {% block scripts %}
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        newMessage: '',
+        showMessages: false,
+        messages: {},
+        stall: null,
+        orders: [],
+        // Mock data
+        model: null,
+        mockMerch: ['Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'],
+        mockOrder: ['1', '2', '3']
+      }
+    },
+    computed: {},
+    methods: {
+      clearMessage() {
+        this.newMessage = ''
+        this.$refs.newMessage.focus()
+      },
+      sendMessage() {
+        let message = {
+          key: Date.now(),
+          text: this.newMessage,
+          from: 'me'
+        }
+        this.$set(this.messages, message.key, message)
+
+        this.clearMessage()
+      },
+      sliceKey(key) {
+        if (!key) return ''
+        return `${key.slice(0, 4)}...${key.slice(-4)}`
+      }
+    },
+    created() {
+      let stall = JSON.parse('{{ stall | tojson }}')
+      let orders = JSON.parse('{{ orders | tojson }}')
+
+      this.stall = stall
+      this.orders = orders
+      console.log(stall)
+      console.log(orders)
+    }
+  })
+</script>
+<style scoped>
+  .chat-container {
+    position: relative;
+    display: grid;
+    grid-template-rows: 1fr auto;
+    height: calc(100vh - 133px);
+  }
+
+  .chat-box {
+    display: flex;
+    flex-direction: column-reverse;
+    padding: 1rem;
+    overflow-y: auto;
+  }
+
+  .chat-messages {
+    width: auto;
+  }
+
+  .chat-other {
+  }
+
+  .chat-input {
+    position: relative;
+    display: flex;
+    align-items: end;
+    margin-top: 1rem;
+  }
+</style>
+{% endblock %}

From e0b93fbd49df489bc8dcea3ec1cab41650b2a49f Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 28 Sep 2022 11:12:34 +0100
Subject: [PATCH 095/174] chat and WS initial commit

---
 lnbits/extensions/diagonalley/views.py | 49 ++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index d0fee249..d6e701a0 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -1,6 +1,7 @@
 from http import HTTPStatus
+from typing import List
 
-from fastapi import Request
+from fastapi import Query, Request, WebSocket, WebSocketDisconnect
 from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
 from loguru import logger
@@ -11,10 +12,10 @@ from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
 
-from ...core.crud import get_wallet
 from .crud import (
     get_diagonalley_market,
     get_diagonalley_market_stalls,
+    get_diagonalley_order_details,
     get_diagonalley_products,
     get_diagonalley_stall,
     get_diagonalley_zone,
@@ -31,6 +32,22 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
         "diagonalley/index.html", {"request": request, "user": user.dict()}
     )
 
+@diagonalley_ext.get("/chat", response_class=HTMLResponse)
+async def chat_page(request: Request, merch: str =  Query(...), order: str = Query(...)):
+    stall = await get_diagonalley_stall(merch)
+    orders = await get_diagonalley_order_details(order)
+
+    logger.debug(f"ORDER: {orders}")
+        
+    return diagonalley_renderer().TemplateResponse(
+        "diagonalley/chat.html",
+        {
+            "request": request,
+            "stall": {"id": stall.id, "name": stall.name, "publickey": stall.publickey, "wallet": stall.wallet },
+            "orders": [details.dict() for details in orders]
+        },
+    )
+
 
 @diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
@@ -85,3 +102,31 @@ async def display(request: Request, market_id):
             "products": products,
         },
     )
+
+##################WEBSOCKET ROUTES########################
+
+class ConnectionManager:
+    def __init__(self):
+        self.active_connections: List[WebSocket] = []
+
+    async def connect(self, websocket: WebSocket, order_id: str):
+        await websocket.accept()
+        websocket.id = order_id
+        self.active_connections.append(websocket)
+
+    def disconnect(self, websocket: WebSocket):
+        self.active_connections.remove(websocket)
+
+    async def send_personal_message(self, message: str, order_id: str):
+        for connection in self.active_connections:
+            if connection.id == order_id:
+                await connection.send_text(message)
+
+    async def broadcast(self, message: str):
+        for connection in self.active_connections:
+            await connection.send_text(message)
+
+
+manager = ConnectionManager()
+
+

From b9371805e2eb0038b439a76589d26beca6c507ef Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 28 Sep 2022 17:02:15 +0100
Subject: [PATCH 096/174] websockets working localstorage for review

---
 lnbits/extensions/diagonalley/notifier.py     |  83 ++++++++++
 .../templates/diagonalley/chat.html           | 145 ++++++++++++++----
 .../templates/diagonalley/index.html          |   2 +-
 lnbits/extensions/diagonalley/views.py        |  85 +++++-----
 lnbits/extensions/diagonalley/views_api.py    |   5 +-
 5 files changed, 254 insertions(+), 66 deletions(-)
 create mode 100644 lnbits/extensions/diagonalley/notifier.py

diff --git a/lnbits/extensions/diagonalley/notifier.py b/lnbits/extensions/diagonalley/notifier.py
new file mode 100644
index 00000000..58a9f2bb
--- /dev/null
+++ b/lnbits/extensions/diagonalley/notifier.py
@@ -0,0 +1,83 @@
+## adapted from https://github.com/Sentymental/chat-fastapi-websocket
+"""
+Create a class Notifier that will handle messages
+and delivery to the specific person
+"""
+
+from collections import defaultdict
+
+from fastapi import WebSocket
+from loguru import logger
+
+
+class Notifier:
+    """
+    Manages chatrooms, sessions and members.
+
+    Methods:
+    - get_notification_generator(self): async generator with notification messages
+    - get_members(self, room_name: str): get members in room
+    - push(message: str, room_name: str): push message
+    - connect(websocket: WebSocket, room_name: str): connect to room
+    - remove(websocket: WebSocket, room_name: str): remove
+    - _notify(message: str, room_name: str): notifier
+    """
+
+    def __init__(self):
+        # Create sessions as a dict:
+        self.sessions: dict = defaultdict(dict)
+
+        # Create notification generator:
+        self.generator = self.get_notification_generator()
+
+    async def get_notification_generator(self):
+        """Notification Generator"""
+
+        while True:
+            message = yield
+            msg = message["message"]
+            room_name = message["room_name"]
+            await self._notify(msg, room_name)
+
+    def get_members(self, room_name: str):
+        """Get all members in a room"""
+
+        try:
+            logger.info(f"Looking for members in room: {room_name}")
+            return self.sessions[room_name]
+
+        except Exception:
+            logger.exception(f"There is no member in room: {room_name}")
+            return None
+
+    async def push(self, message: str, room_name: str = None):
+        """Push a message"""
+
+        message_body = {"message": message, "room_name": room_name}
+        await self.generator.asend(message_body)
+
+    async def connect(self, websocket: WebSocket, room_name: str):
+        """Connect to room"""
+
+        await websocket.accept()
+        if self.sessions[room_name] == {} or len(self.sessions[room_name]) == 0:
+            self.sessions[room_name] = []
+
+        self.sessions[room_name].append(websocket)
+        print(f"Connections ...: {self.sessions[room_name]}")
+
+    def remove(self, websocket: WebSocket, room_name: str):
+        """Remove websocket from room"""
+
+        self.sessions[room_name].remove(websocket)
+        print(f"Connection removed...\nOpen connections...: {self.sessions[room_name]}")
+
+    async def _notify(self, message: str, room_name: str):
+        """Notifier"""
+
+        remaining_sessions = []
+        while len(self.sessions[room_name]) > 0:
+            websocket = self.sessions[room_name].pop()
+            await websocket.send_text(message)
+            remaining_sessions.append(websocket)
+        self.sessions[room_name] = remaining_sessions
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
index bb3e607f..1713c9e2 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
@@ -45,13 +45,15 @@
       <q-card-section>
         {% raw %}
         <h6 class="text-subtitle1 q-my-none">{{ stall.name }}</h6>
-        <p @click="copyText(stall.publickey)">
+        <p @click="copyText(stall.publickey)" style="width: max-content">
           Public Key: {{ sliceKey(stall.publickey) }}
-          <q-tooltip>{{ stall.publickey }}</q-tooltip>
+          <q-tooltip>Click to copy</q-tooltip>
         </p>
         {% endraw %}
+      </q-card-section>
+      <q-card-section v-if="user">
         <q-form @submit="" class="q-gutter-md">
-          <q-select
+          <!-- <q-select
             filled
             dense
             emit-value
@@ -60,16 +62,16 @@
             label="Merchant"
             hint="Select a merchant you've opened an order to"
           ></q-select>
-          <br />
+          <br /> -->
           <q-select
             filled
             dense
             emit-value
-            v-model="model"
-            :options="mockOrder"
+            v-model="selectedOrder"
+            :options="user.orders"
             label="Order"
             hint="Select an order from this merchant"
-            :disabled="!this.model"
+            @input="val => { changeOrder() }"
           ></q-select>
         </q-form>
       </q-card-section>
@@ -79,16 +81,26 @@
           Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
           quasi.
         </p>
-        <div class="text-center q-mb-lg">
-          <a :href="'lightning:'">
-            <q-responsive :ratio="1" class="q-mx-xl">
-              <qrcode
-                :value="cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b"
-                :options="{width: 340}"
-                class="rounded-borders"
-              ></qrcode>
-            </q-responsive>
-          </a>
+        <div v-if="user?.keys" class="row">
+          <div
+            class="col-6"
+            v-for="type in ['publickey', 'privatekey']"
+            v-bind:key="type"
+          >
+            <div class="text-center q-mb-lg">
+              {% raw %}
+              <q-responsive :ratio="1" class="q-mx-xl">
+                <qrcode
+                  :value="user.keys[type]"
+                  :options="{width: 250}"
+                  class="rounded-borders"
+                ></qrcode>
+                <q-tooltip>{{ user.keys[type] }}</q-tooltip>
+              </q-responsive>
+              <p>{{ type == 'publickey' ? 'Public Key' : 'Private Key' }}</p>
+              {% endraw %}
+            </div>
+          </div>
         </div>
         <p>
           Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
@@ -123,7 +135,9 @@
         showMessages: false,
         messages: {},
         stall: null,
+        selectedOrder: null,
         orders: [],
+        user: null,
         // Mock data
         model: null,
         mockMerch: ['Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'],
@@ -136,29 +150,108 @@
         this.newMessage = ''
         this.$refs.newMessage.focus()
       },
-      sendMessage() {
+      sendMessage(e) {
         let message = {
           key: Date.now(),
           text: this.newMessage,
           from: 'me'
         }
-        this.$set(this.messages, message.key, message)
+        ws.send(JSON.stringify(message))
 
         this.clearMessage()
+        e.preventDefault()
       },
       sliceKey(key) {
         if (!key) return ''
         return `${key.slice(0, 4)}...${key.slice(-4)}`
+      },
+      async generateKeys() {
+        await LNbits.api
+          .request('GET', '/diagonalley/api/v1/keys', null)
+          .then(response => {
+            if (response.data) {
+              let data = {
+                keys: {
+                  privatekey: response.data.privkey,
+                  publickey: response.data.pubkey
+                }
+              }
+              this.user = data
+              console.log('Keys done', this.user)
+              return
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      changeOrder() {
+        console.log(this.selectedOrder)
+      },
+      startChat(room_name) {
+        if (location.protocol == 'https:') {
+          ws_scheme = 'wss://'
+        } else {
+          ws_scheme = 'ws://'
+        }
+        ws = new WebSocket(
+          ws_scheme + location.host + '/diagonalley/ws/' + room_name
+        )
+
+        function checkWebSocket(event) {
+          if (ws.readyState === WebSocket.CLOSED) {
+            console.log('WebSocket CLOSED: Reopening')
+            ws = new WebSocket(
+              ws_scheme + location.host + '/diagonalley/ws/' + room_name
+            )
+          }
+        }
+
+        ws.onmessage = event => {
+          let event_data = JSON.parse(event.data)
+
+          this.$set(this.messages, event_data.key, event_data)
+          this.$q.localStorage.set()
+        }
+
+        this.ws = ws
       }
     },
-    created() {
-      let stall = JSON.parse('{{ stall | tojson }}')
-      let orders = JSON.parse('{{ orders | tojson }}')
+    async created() {
+      this.stall = JSON.parse('{{ stall | tojson }}')
 
-      this.stall = stall
-      this.orders = orders
-      console.log(stall)
-      console.log(orders)
+      let order_details = JSON.parse('{{ order | tojson }}')
+      let order_id = order_details[0].order_id
+
+      let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
+
+      try {
+        if (data) {
+          this.user = data
+          //add chat key (merchant pubkey) if not set
+          if (!this.user.chats[`${this.stall.publickey}`]) {
+            this.$set(this.user.chats, this.stall.publickey, [])
+          }
+          //this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
+        } else {
+          // generate keys
+          await this.generateKeys()
+          // populate user data
+          this.user.chats = {
+            [`${this.stall.publickey}`]: []
+          }
+          this.user.orders = []
+        }
+
+        this.order_details = order_details
+        this.user.orders = [...new Set([...this.user.orders, order_id])]
+        this.selectedOrder = order_id
+
+        this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
+        this.startChat(order_id)
+      } catch (e) {
+        console.error(e)
+      }
     }
   })
 </script>
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index cd03e6f3..5ad6f6a5 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -644,7 +644,7 @@
                   icon="storefront"
                   :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
                   type="a"
-                  :href="'/diagonalley/' + props.row.id"
+                  :href="'/diagonalley/stalls/' + props.row.id"
                   target="_blank"
                 ></q-btn>
                 <q-tooltip> Link to pass to stall relay </q-tooltip>
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index d6e701a0..a378658a 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -1,7 +1,8 @@
+import json
 from http import HTTPStatus
 from typing import List
 
-from fastapi import Query, Request, WebSocket, WebSocketDisconnect
+from fastapi import BackgroundTasks, Query, Request, WebSocket, WebSocketDisconnect
 from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
 from loguru import logger
@@ -11,6 +12,7 @@ from starlette.responses import HTMLResponse
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
+from lnbits.extensions.diagonalley.notifier import Notifier
 
 from .crud import (
     get_diagonalley_market,
@@ -32,24 +34,8 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
         "diagonalley/index.html", {"request": request, "user": user.dict()}
     )
 
-@diagonalley_ext.get("/chat", response_class=HTMLResponse)
-async def chat_page(request: Request, merch: str =  Query(...), order: str = Query(...)):
-    stall = await get_diagonalley_stall(merch)
-    orders = await get_diagonalley_order_details(order)
 
-    logger.debug(f"ORDER: {orders}")
-        
-    return diagonalley_renderer().TemplateResponse(
-        "diagonalley/chat.html",
-        {
-            "request": request,
-            "stall": {"id": stall.id, "name": stall.name, "publickey": stall.publickey, "wallet": stall.wallet },
-            "orders": [details.dict() for details in orders]
-        },
-    )
-
-
-@diagonalley_ext.get("/{stall_id}", response_class=HTMLResponse)
+@diagonalley_ext.get("/stalls/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
     stall = await get_diagonalley_stall(stall_id)
     products = await get_diagonalley_products(stall_id)
@@ -103,30 +89,55 @@ async def display(request: Request, market_id):
         },
     )
 
+
+@diagonalley_ext.get("/chat", response_class=HTMLResponse)
+async def chat_page(request: Request, merch: str = Query(...), order: str = Query(...)):
+    stall = await get_diagonalley_stall(merch)
+    _order = await get_diagonalley_order_details(order)
+
+    return diagonalley_renderer().TemplateResponse(
+        "diagonalley/chat.html",
+        {
+            "request": request,
+            "stall": {
+                "id": stall.id,
+                "name": stall.name,
+                "publickey": stall.publickey,
+                "wallet": stall.wallet,
+            },
+            "order": [details.dict() for details in _order],
+        },
+    )
+
+
 ##################WEBSOCKET ROUTES########################
 
-class ConnectionManager:
-    def __init__(self):
-        self.active_connections: List[WebSocket] = []
+# Initialize Notifier:
+notifier = Notifier()
 
-    async def connect(self, websocket: WebSocket, order_id: str):
-        await websocket.accept()
-        websocket.id = order_id
-        self.active_connections.append(websocket)
+@diagonalley_ext.websocket("/ws/{room_name}")
+async def websocket_endpoint(
+    websocket: WebSocket, room_name: str, background_tasks: BackgroundTasks
+):
+    await notifier.connect(websocket, room_name)
+    try:
+        while True:
+            data = await websocket.receive_text()
+            d = json.loads(data)
+            d["room_name"] = room_name
 
-    def disconnect(self, websocket: WebSocket):
-        self.active_connections.remove(websocket)
+            room_members = (
+                notifier.get_members(room_name)
+                if notifier.get_members(room_name) is not None
+                else []
+            )
 
-    async def send_personal_message(self, message: str, order_id: str):
-        for connection in self.active_connections:
-            if connection.id == order_id:
-                await connection.send_text(message)
+            if websocket not in room_members:
+                print("Sender not in room member: Reconnecting...")
+                await notifier.connect(websocket, room_name)
 
-    async def broadcast(self, message: str):
-        for connection in self.active_connections:
-            await connection.send_text(message)
-
-
-manager = ConnectionManager()
+            await notifier._notify(f"{data}", room_name)
 
+    except WebSocketDisconnect:
+        notifier.remove(websocket, room_name)
 
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index c3615c90..aa8d338d 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -469,14 +469,15 @@ async def api_diagonalley_stall_create(
 
     return market.dict()
 
+
 ## KEYS
 
+
 @diagonalley_ext.get("/api/v1/keys")
-async def api_diagonalley_generate_keys(wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_diagonalley_generate_keys():
     private_key = PrivateKey()
     public_key = private_key.pubkey.serialize().hex()
     while not public_key.startswith("02"):
         private_key = PrivateKey()
         public_key = private_key.pubkey.serialize().hex()
     return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}
-

From 8ab9590594fc55bfc0a4bf9d3a7a799554c2ad83 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 28 Sep 2022 17:03:09 +0100
Subject: [PATCH 097/174] format

---
 lnbits/extensions/diagonalley/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index a378658a..7b242aed 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -115,6 +115,7 @@ async def chat_page(request: Request, merch: str = Query(...), order: str = Quer
 # Initialize Notifier:
 notifier = Notifier()
 
+
 @diagonalley_ext.websocket("/ws/{room_name}")
 async def websocket_endpoint(
     websocket: WebSocket, room_name: str, background_tasks: BackgroundTasks
@@ -140,4 +141,3 @@ async def websocket_endpoint(
 
     except WebSocketDisconnect:
         notifier.remove(websocket, room_name)
-

From 57bb9665c69e4194fce86ecea75b36b36c0dffd9 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Sep 2022 10:16:34 +0100
Subject: [PATCH 098/174] chat messages stored in db

---
 lnbits/extensions/diagonalley/crud.py         | 15 +++++++++++
 lnbits/extensions/diagonalley/migrations.py   | 24 +++++++++++++++++
 lnbits/extensions/diagonalley/models.py       | 13 +++++++++
 lnbits/extensions/diagonalley/notifier.py     | 10 +++++++
 .../templates/diagonalley/chat.html           | 27 ++++++++++---------
 lnbits/extensions/diagonalley/views.py        |  6 +++--
 6 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 8f053de1..9e3f2013 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -9,6 +9,7 @@ from lnbits.settings import WALLET
 
 from . import db
 from .models import (
+    CreateChatMessage,
     CreateMarket,
     CreateMarketStalls,
     Market,
@@ -405,3 +406,17 @@ async def create_diagonalley_market_stalls(
 
 async def update_diagonalley_market(market_id):
     pass
+
+async def create_chat_message(data: CreateChatMessage):
+    print("DATA", data)
+    await db.execute(
+        """
+            INSERT INTO diagonalley.messages (msg, pubkey, id_conversation)
+            VALUES (?, ?, ?)
+            """,
+        (
+            data.msg,
+            data.pubkey,
+            data.room_name,
+        ),
+    )
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 6e1510a7..3bcddcb0 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -113,3 +113,27 @@ async def m001_initial(db):
         );
     """
     )
+
+async def m002_add_chat_messages(db):
+    """
+    Initial chat messages table.
+    """
+    await db.execute(
+        f"""
+        CREATE TABLE diagonalley.messages (
+            id {db.serial_primary_key},
+            msg TEXT NOT NULL,
+            pubkey TEXT NOT NULL,
+            id_conversation TEXT NOT NULL,
+            timestamp TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """            
+        );
+    """
+    )
+
+    """
+    Create indexes for message fetching 
+    """
+    await db.execute("CREATE INDEX idx_messages_timestamp ON diagonalley.messages (timestamp DESC)")
+    await db.execute("CREATE INDEX idx_messages_conversations ON diagonalley.messages (id_conversation)")
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index c3234bb6..f9fa1bca 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -107,3 +107,16 @@ class Market(BaseModel):
 
 class CreateMarketStalls(BaseModel):
     stallid: str
+
+
+class ChatMessage(BaseModel):
+    id: str
+    msg: str
+    pubkey: str
+    id_conversation: str
+    timestamp: int
+
+class CreateChatMessage(BaseModel):
+    msg: str = Query(..., min_length=1)
+    pubkey: str = Query(...)
+    room_name: str = Query(...)
diff --git a/lnbits/extensions/diagonalley/notifier.py b/lnbits/extensions/diagonalley/notifier.py
index 58a9f2bb..e21be500 100644
--- a/lnbits/extensions/diagonalley/notifier.py
+++ b/lnbits/extensions/diagonalley/notifier.py
@@ -4,11 +4,15 @@ Create a class Notifier that will handle messages
 and delivery to the specific person
 """
 
+import json
 from collections import defaultdict
 
 from fastapi import WebSocket
 from loguru import logger
 
+from lnbits.extensions.diagonalley.crud import create_chat_message
+from lnbits.extensions.diagonalley.models import CreateChatMessage
+
 
 class Notifier:
     """
@@ -75,6 +79,12 @@ class Notifier:
     async def _notify(self, message: str, room_name: str):
         """Notifier"""
 
+        d = json.loads(message)
+        d["room_name"] = room_name
+        db_msg = CreateChatMessage.parse_obj(d)
+        print("NOT:", db_msg)
+        await create_chat_message(data=db_msg)
+
         remaining_sessions = []
         while len(self.sessions[room_name]) > 0:
             websocket = self.sessions[room_name].pop()
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
index 1713c9e2..21f59361 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
@@ -7,12 +7,12 @@
           <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
           <div class="chat-messages">
             <q-chat-message
-              :key="key"
-              v-for="(message, key) in messages"
-              :name="message.from == 'me' ? 'me' : 'merchant'"
-              :text="[message.text]"
-              :sent="message.from == 'me' ? true : false"
-              :bg-color="message.from == 'me' ? 'white' : 'light-green-2'"
+              :key="index"
+              v-for="(message, index) in messages"
+              :name="message.pubkey == user.keys.publickey ? 'me' : 'merchant'"
+              :text="[message.msg]"
+              :sent="message.pubkey == user.keys.publickey ? true : false"
+              :bg-color="message.pubkey == user.keys.publickey ? 'white' : 'light-green-2'"
             />
           </div>
         </div>
@@ -125,6 +125,9 @@
 </div>
 {% endblock %} {% block scripts %}
 <script>
+  const mapChatMsg = obj => {
+    return
+  }
   Vue.component(VueQrcode.name, VueQrcode)
   new Vue({
     el: '#vue',
@@ -150,16 +153,14 @@
         this.newMessage = ''
         this.$refs.newMessage.focus()
       },
-      sendMessage(e) {
+      sendMessage() {
         let message = {
-          key: Date.now(),
-          text: this.newMessage,
-          from: 'me'
+          msg: this.newMessage,
+          pubkey: this.user.keys.publickey
         }
         ws.send(JSON.stringify(message))
 
         this.clearMessage()
-        e.preventDefault()
       },
       sliceKey(key) {
         if (!key) return ''
@@ -210,8 +211,8 @@
         ws.onmessage = event => {
           let event_data = JSON.parse(event.data)
 
-          this.$set(this.messages, event_data.key, event_data)
-          this.$q.localStorage.set()
+          this.$set(this.messages, Date.now(), event_data)
+          console.log(this.messages)
         }
 
         this.ws = ws
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 7b242aed..65ba3b5d 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -12,9 +12,11 @@ from starlette.responses import HTMLResponse
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
+from lnbits.extensions.diagonalley.models import CreateChatMessage
 from lnbits.extensions.diagonalley.notifier import Notifier
 
 from .crud import (
+    create_chat_message,
     get_diagonalley_market,
     get_diagonalley_market_stalls,
     get_diagonalley_order_details,
@@ -136,8 +138,8 @@ async def websocket_endpoint(
             if websocket not in room_members:
                 print("Sender not in room member: Reconnecting...")
                 await notifier.connect(websocket, room_name)
-
-            await notifier._notify(f"{data}", room_name)
+                        
+            await notifier._notify(data, room_name)
 
     except WebSocketDisconnect:
         notifier.remove(websocket, room_name)

From db2ffadb43fad5c3c48eb4fba559d0b203d870a0 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Sep 2022 17:28:35 +0100
Subject: [PATCH 099/174] retrieve chat messages from db

---
 lnbits/extensions/diagonalley/crud.py         | 16 ++++++++
 .../templates/diagonalley/chat.html           | 41 ++++++++++++++++---
 lnbits/extensions/diagonalley/views_api.py    | 14 +++++++
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 9e3f2013..6bde37fa 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -9,6 +9,7 @@ from lnbits.settings import WALLET
 
 from . import db
 from .models import (
+    ChatMessage,
     CreateChatMessage,
     CreateMarket,
     CreateMarketStalls,
@@ -420,3 +421,18 @@ async def create_chat_message(data: CreateChatMessage):
             data.room_name,
         ),
     )
+
+async def get_diagonalley_latest_chat_messages(room_name: str):
+    rows = await db.fetchall(
+        "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20", (room_name,)
+    )
+
+    return [ChatMessage(**row) for row in rows]
+
+async def get_diagonalley_chat_messages(room_name: str):
+    rows = await db.fetchall(
+        "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC", (room_name,)
+    )
+
+    return [ChatMessage(**row) for row in rows]
+    
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
index 21f59361..adbdb047 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
@@ -125,8 +125,13 @@
 </div>
 {% endblock %} {% block scripts %}
 <script>
-  const mapChatMsg = obj => {
-    return
+  const mapChatMsg = msg => {
+    let obj = {}
+    obj.timestamp = {
+      msg: msg,
+      pubkey: pubkey
+    }
+    return obj
   }
   Vue.component(VueQrcode.name, VueQrcode)
   new Vue({
@@ -186,6 +191,29 @@
             LNbits.utils.notifyApiError(error)
           })
       },
+      async getMessages(room_name, all = false) {
+        await LNbits.api
+          .request(
+            'GET',
+            `/diagonalley/api/v1/chat/messages/${room_name}${
+              all ? '?all_messages=true' : ''
+            }`
+          )
+          .then(response => {
+            if (response.data) {
+              console.log(response.data)
+              response.data.reverse().map(m => {
+                this.$set(this.messages, m.timestamp * 1000, {
+                  msg: m.msg,
+                  pubkey: m.pubkey
+                })
+              })
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
       changeOrder() {
         console.log(this.selectedOrder)
       },
@@ -212,7 +240,6 @@
           let event_data = JSON.parse(event.data)
 
           this.$set(this.messages, Date.now(), event_data)
-          console.log(this.messages)
         }
 
         this.ws = ws
@@ -230,8 +257,8 @@
         if (data) {
           this.user = data
           //add chat key (merchant pubkey) if not set
-          if (!this.user.chats[`${this.stall.publickey}`]) {
-            this.$set(this.user.chats, this.stall.publickey, [])
+          if (!this.user.chats[`${order_id}`]) {
+            this.$set(this.user.chats, order_id, [])
           }
           //this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
         } else {
@@ -239,7 +266,7 @@
           await this.generateKeys()
           // populate user data
           this.user.chats = {
-            [`${this.stall.publickey}`]: []
+            [`${order_id}`]: []
           }
           this.user.orders = []
         }
@@ -248,6 +275,8 @@
         this.user.orders = [...new Set([...this.user.orders, order_id])]
         this.selectedOrder = order_id
 
+        await this.getMessages(order_id)
+
         this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
         this.startChat(order_id)
       } catch (e) {
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index aa8d338d..2dcd16aa 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -34,6 +34,8 @@ from .crud import (
     delete_diagonalley_product,
     delete_diagonalley_stall,
     delete_diagonalley_zone,
+    get_diagonalley_chat_messages,
+    get_diagonalley_latest_chat_messages,
     get_diagonalley_market,
     get_diagonalley_market_stalls,
     get_diagonalley_markets,
@@ -481,3 +483,15 @@ async def api_diagonalley_generate_keys():
         private_key = PrivateKey()
         public_key = private_key.pubkey.serialize().hex()
     return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}
+
+
+## MESSAGES/CHAT
+
+@diagonalley_ext.get("/api/v1/chat/messages/{room_name}")
+async def api_get_latest_chat_msg(room_name: str, all_messages: bool = Query(False)):
+    if(all_messages):
+        messages = await get_diagonalley_chat_messages(room_name)
+    else:
+        messages = await get_diagonalley_latest_chat_messages(room_name)
+
+    return messages

From 98ef0dfcb1ca4e2aa9eb9b663013bb32c32c849f Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Sep 2022 17:29:35 +0100
Subject: [PATCH 100/174] format

---
 lnbits/extensions/diagonalley/crud.py       | 10 +++++++---
 lnbits/extensions/diagonalley/migrations.py |  9 +++++++--
 lnbits/extensions/diagonalley/models.py     |  1 +
 lnbits/extensions/diagonalley/views.py      |  2 +-
 lnbits/extensions/diagonalley/views_api.py  |  3 ++-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 6bde37fa..18207888 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -408,6 +408,7 @@ async def create_diagonalley_market_stalls(
 async def update_diagonalley_market(market_id):
     pass
 
+
 async def create_chat_message(data: CreateChatMessage):
     print("DATA", data)
     await db.execute(
@@ -422,17 +423,20 @@ async def create_chat_message(data: CreateChatMessage):
         ),
     )
 
+
 async def get_diagonalley_latest_chat_messages(room_name: str):
     rows = await db.fetchall(
-        "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20", (room_name,)
+        "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20",
+        (room_name,),
     )
 
     return [ChatMessage(**row) for row in rows]
 
+
 async def get_diagonalley_chat_messages(room_name: str):
     rows = await db.fetchall(
-        "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC", (room_name,)
+        "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC",
+        (room_name,),
     )
 
     return [ChatMessage(**row) for row in rows]
-    
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 3bcddcb0..74abcba7 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -114,6 +114,7 @@ async def m001_initial(db):
     """
     )
 
+
 async def m002_add_chat_messages(db):
     """
     Initial chat messages table.
@@ -135,5 +136,9 @@ async def m002_add_chat_messages(db):
     """
     Create indexes for message fetching 
     """
-    await db.execute("CREATE INDEX idx_messages_timestamp ON diagonalley.messages (timestamp DESC)")
-    await db.execute("CREATE INDEX idx_messages_conversations ON diagonalley.messages (id_conversation)")
+    await db.execute(
+        "CREATE INDEX idx_messages_timestamp ON diagonalley.messages (timestamp DESC)"
+    )
+    await db.execute(
+        "CREATE INDEX idx_messages_conversations ON diagonalley.messages (id_conversation)"
+    )
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index f9fa1bca..b1bfdc9c 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -116,6 +116,7 @@ class ChatMessage(BaseModel):
     id_conversation: str
     timestamp: int
 
+
 class CreateChatMessage(BaseModel):
     msg: str = Query(..., min_length=1)
     pubkey: str = Query(...)
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 65ba3b5d..1addb8a7 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -138,7 +138,7 @@ async def websocket_endpoint(
             if websocket not in room_members:
                 print("Sender not in room member: Reconnecting...")
                 await notifier.connect(websocket, room_name)
-                        
+
             await notifier._notify(data, room_name)
 
     except WebSocketDisconnect:
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 2dcd16aa..f84ea8e9 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -487,9 +487,10 @@ async def api_diagonalley_generate_keys():
 
 ## MESSAGES/CHAT
 
+
 @diagonalley_ext.get("/api/v1/chat/messages/{room_name}")
 async def api_get_latest_chat_msg(room_name: str, all_messages: bool = Query(False)):
-    if(all_messages):
+    if all_messages:
         messages = await get_diagonalley_chat_messages(room_name)
     else:
         messages = await get_diagonalley_latest_chat_messages(room_name)

From bd4fd73417b1e5117397b50a1414e3c0faa9a01b Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 4 Oct 2022 09:58:53 +0100
Subject: [PATCH 101/174] rename endpoint and add more data

---
 .../templates/diagonalley/order.html          | 351 ++++++++++++++++++
 1 file changed, 351 insertions(+)
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/order.html

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
new file mode 100644
index 00000000..aa9d0de4
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -0,0 +1,351 @@
+{% extends "public.html" %} {% block page %}
+<div class="row q-col-gutter-md flex">
+  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
+    <q-card>
+      <div class="chat-container q-pa-md">
+        <div class="chat-box">
+          <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
+          <div class="chat-messages">
+            <q-chat-message
+              :key="index"
+              v-for="(message, index) in messages"
+              :name="message.pubkey == user.keys.publickey ? 'me' : 'merchant'"
+              :text="[message.msg]"
+              :sent="message.pubkey == user.keys.publickey ? true : false"
+              :bg-color="message.pubkey == user.keys.publickey ? 'white' : 'light-green-2'"
+            />
+          </div>
+        </div>
+        <q-form @submit="sendMessage" class="full-width chat-input">
+          <q-input
+            ref="newMessage"
+            v-model="newMessage"
+            placeholder="Message"
+            class="full-width"
+            dense
+            outlined
+          >
+            <template>
+              <q-btn
+                round
+                dense
+                flat
+                type="submit"
+                icon="send"
+                color="primary"
+              />
+            </template>
+          </q-input>
+        </q-form>
+      </div>
+    </q-card>
+  </div>
+  <div class="col-12 col-md-5 col-lg-6 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        {% raw %}
+        <h6 class="text-subtitle1 q-my-none">{{ stall.name }}</h6>
+        <p @click="copyText(stall.publickey)" style="width: max-content">
+          Public Key: {{ sliceKey(stall.publickey) }}
+          <q-tooltip>Click to copy</q-tooltip>
+        </p>
+        {% endraw %}
+      </q-card-section>
+      <q-card-section v-if="user">
+        <q-form @submit="" class="q-gutter-md">
+          <!-- <q-select
+            filled
+            dense
+            emit-value
+            v-model="model"
+            :options="mockMerch"
+            label="Merchant"
+            hint="Select a merchant you've opened an order to"
+          ></q-select>
+          <br /> -->
+          <q-select
+            filled
+            dense
+            emit-value
+            v-model="selectedOrder"
+            :options="user.orders"
+            label="Order"
+            hint="Select an order from this merchant"
+            @input="val => { changeOrder() }"
+          ></q-select>
+        </q-form>
+      </q-card-section>
+      <q-card-section>
+        <q-list>
+          {% raw %}
+          <q-item clickable :key="p.id" v-for="p in products">
+            <q-item-section side>
+              <span>{{p.quantity}} x </span>
+            </q-item-section>
+            <q-item-section avatar>
+              <q-avatar color="primary">
+                <img size="sm" :src="p.image" />
+              </q-avatar>
+            </q-item-section>
+            <q-item-section>
+              <q-item-label>{{ p.name }}</q-item-label>
+            </q-item-section>
+
+            <q-item-section side>
+              <span> {{p.price}} sats</span>
+            </q-item-section>
+          </q-item>
+          {% endraw %}
+        </q-list>
+      </q-card-section>
+      <q-card-section>
+        <q-separator></q-separator>
+        <p>
+          Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
+          quasi.
+        </p>
+        <div v-if="user?.keys" class="row">
+          <div
+            class="col-6"
+            v-for="type in ['publickey', 'privatekey']"
+            v-bind:key="type"
+          >
+            <div class="text-center q-mb-lg">
+              {% raw %}
+              <q-responsive :ratio="1" class="q-mx-xl">
+                <qrcode
+                  :value="user.keys[type]"
+                  :options="{width: 250}"
+                  class="rounded-borders"
+                ></qrcode>
+                <q-tooltip>{{ user.keys[type] }}</q-tooltip>
+              </q-responsive>
+              <p>{{ type == 'publickey' ? 'Public Key' : 'Private Key' }}</p>
+              {% endraw %}
+            </div>
+          </div>
+        </div>
+        <p>
+          Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
+          quasi.
+        </p>
+      </q-card-section>
+      <q-card-section>
+        <q-separator></q-separator>
+        <div class="row q-mt-lg">
+          <q-btn outline color="grey" @click=""
+            >Backup keys
+            <q-tooltip>Download your keys</q-tooltip>
+          </q-btn>
+          <q-btn @click="" v-close-popup flat color="grey" class="q-ml-auto"
+            >Delete data
+            <q-tooltip>Delete all data from browser</q-tooltip>
+          </q-btn>
+        </div>
+      </q-card-section>
+    </q-card>
+  </div>
+</div>
+{% endblock %} {% block scripts %}
+<script>
+  const mapChatMsg = msg => {
+    let obj = {}
+    obj.timestamp = {
+      msg: msg,
+      pubkey: pubkey
+    }
+    return obj
+  }
+  Vue.component(VueQrcode.name, VueQrcode)
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        newMessage: '',
+        showMessages: false,
+        messages: {},
+        stall: null,
+        selectedOrder: null,
+        products: [],
+        orders: [],
+        user: null,
+        // Mock data
+        model: null,
+        mockMerch: ['Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'],
+        mockOrder: ['1', '2', '3']
+      }
+    },
+    computed: {},
+    methods: {
+      clearMessage() {
+        this.newMessage = ''
+        this.$refs.newMessage.focus()
+      },
+      sendMessage() {
+        let message = {
+          msg: this.newMessage,
+          pubkey: this.user.keys.publickey
+        }
+        ws.send(JSON.stringify(message))
+
+        this.clearMessage()
+      },
+      sliceKey(key) {
+        if (!key) return ''
+        return `${key.slice(0, 4)}...${key.slice(-4)}`
+      },
+      async generateKeys() {
+        await LNbits.api
+          .request('GET', '/diagonalley/api/v1/keys', null)
+          .then(response => {
+            if (response.data) {
+              let data = {
+                keys: {
+                  privatekey: response.data.privkey,
+                  publickey: response.data.pubkey
+                }
+              }
+              this.user = data
+              return
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      async getMessages(room_name, all = false) {
+        await LNbits.api
+          .request(
+            'GET',
+            `/diagonalley/api/v1/chat/messages/${room_name}${
+              all ? '?all_messages=true' : ''
+            }`
+          )
+          .then(response => {
+            if (response.data) {
+              response.data.reverse().map(m => {
+                this.$set(this.messages, m.timestamp * 1000, {
+                  msg: m.msg,
+                  pubkey: m.pubkey
+                })
+              })
+            }
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      changeOrder() {
+        console.log(this.selectedOrder)
+      },
+      startChat(room_name) {
+        if (location.protocol == 'https:') {
+          ws_scheme = 'wss://'
+        } else {
+          ws_scheme = 'ws://'
+        }
+        ws = new WebSocket(
+          ws_scheme + location.host + '/diagonalley/ws/' + room_name
+        )
+
+        function checkWebSocket(event) {
+          if (ws.readyState === WebSocket.CLOSED) {
+            console.log('WebSocket CLOSED: Reopening')
+            ws = new WebSocket(
+              ws_scheme + location.host + '/diagonalley/ws/' + room_name
+            )
+          }
+        }
+
+        ws.onmessage = event => {
+          let event_data = JSON.parse(event.data)
+
+          this.$set(this.messages, Date.now(), event_data)
+        }
+
+        this.ws = ws
+      }
+    },
+    async created() {
+      this.stall = JSON.parse('{{ stall | tojson }}')
+      let order_details = JSON.parse('{{ order | tojson }}')
+      let products = JSON.parse('{{ products | tojson }}')
+
+      let order_id = '{{ order_id }}'
+
+      let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
+
+      try {
+        if (data) {
+          this.user = data
+          //add chat key (merchant pubkey) if not set
+          if (!this.user.chats[`${order_id}`]) {
+            this.$set(this.user.chats, order_id, [])
+          }
+          //this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
+        } else {
+          // generate keys
+          await this.generateKeys()
+          // populate user data
+          this.user.chats = {
+            [`${order_id}`]: []
+          }
+          this.user.orders = []
+        }
+
+        this.order_details = order_details
+        this.products = order_details.map(o => {
+          let product = products.find(p => p.id == o.product_id)
+          return {
+            quantity: o.quantity,
+            name: product.product,
+            image: product.image,
+            price: product.price
+          }
+        })
+
+        this.user.orders = [...new Set([...this.user.orders, order_id])]
+        this.selectedOrder = order_id
+
+        await this.getMessages(order_id)
+
+        this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
+        this.startChat(order_id)
+        console.log(this.products)
+      } catch (e) {
+        console.error(e)
+      }
+    }
+  })
+</script>
+<style scoped>
+  .chat-container {
+    position: relative;
+    display: grid;
+    grid-template-rows: 1fr auto;
+    height: calc(100vh - 133px);
+  }
+
+  .chat-box {
+    display: flex;
+    flex-direction: column-reverse;
+    padding: 1rem;
+    overflow-y: auto;
+  }
+
+  .chat-messages {
+    width: auto;
+  }
+
+  .chat-other {
+  }
+
+  .chat-input {
+    position: relative;
+    display: flex;
+    align-items: end;
+    margin-top: 1rem;
+  }
+</style>
+{% endblock %}

From d5388ba7dee48554fd9ba1f09fa8e887f0477187 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 4 Oct 2022 09:59:18 +0100
Subject: [PATCH 102/174] add publickey if stored

---
 .../templates/diagonalley/stall.html          | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 9396d663..a3a04b1e 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -162,6 +162,17 @@
           v-model.trim="checkoutDialog.data.username"
           label="Name *optional"
         ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.trim="checkoutDialog.data.pubkey"
+          label="Public key *optional"
+        >
+          <template v-slot:append>
+            <q-icon @click="getPubkey" name="settings_backup_restore" />
+            <q-tooltip>Click to restore saved public key</q-tooltip>
+          </template>
+        </q-input>
         <q-input
           filled
           dense
@@ -206,7 +217,7 @@
           <q-btn
             v-close-popup
             flat
-            @click="checkoutDialog = {show: false, data: {}}"
+            @click="checkoutDialog = {show: false, data: {pubkey: ''}}"
             color="grey"
             class="q-ml-auto"
             >Cancel</q-btn
@@ -276,7 +287,9 @@
         cartMenu: [],
         checkoutDialog: {
           show: false,
-          data: {}
+          data: {
+            pubkey: ''
+          }
         },
         qrCodeDialog: {
           data: {
@@ -346,6 +359,18 @@
         })
         console.log(this.cartMenu, this.cart)
       },
+      getPubkey() {
+        let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
+        if (data && data.keys.publickey) {
+          this.checkoutDialog.data.pubkey = data.keys.publickey
+        } else {
+          this.$q.notify({
+            type: 'warning',
+            message: 'No public key stored!',
+            icon: 'settings_backup_restore'
+          })
+        }
+      },
       placeOrder() {
         let dialog = this.checkoutDialog.data
         let data = {

From 12d94b3e609f038b278f7f1a8198940ba8c3fd18 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 4 Oct 2022 09:59:34 +0100
Subject: [PATCH 103/174] placeholder for product page WIP

---
 .../diagonalley/templates/diagonalley/product.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/product.html

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/product.html b/lnbits/extensions/diagonalley/templates/diagonalley/product.html
new file mode 100644
index 00000000..66f56691
--- /dev/null
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/product.html
@@ -0,0 +1,14 @@
+{% extends "public.html" %} {% block page %}
+<h1>Product page</h1>
+{% endblock %} {% block scripts %}
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {}
+    }
+  })
+</script>
+{% endblock %}

From c59e9efabc70735c1d9825557b70b254cbb6f5fa Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 4 Oct 2022 10:00:42 +0100
Subject: [PATCH 104/174] add public key and refactor endpoint

---
 lnbits/extensions/diagonalley/crud.py         |   1 +
 lnbits/extensions/diagonalley/models.py       |   1 +
 .../templates/diagonalley/chat.html           | 317 ------------------
 lnbits/extensions/diagonalley/views.py        |  13 +-
 4 files changed, 11 insertions(+), 321 deletions(-)
 delete mode 100644 lnbits/extensions/diagonalley/templates/diagonalley/chat.html

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 18207888..f093ba69 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -408,6 +408,7 @@ async def create_diagonalley_market_stalls(
 async def update_diagonalley_market(market_id):
     pass
 
+### CHAT / MESSAGES
 
 async def create_chat_message(data: CreateChatMessage):
     print("DATA", data)
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py
index b1bfdc9c..e3ea2cc6 100644
--- a/lnbits/extensions/diagonalley/models.py
+++ b/lnbits/extensions/diagonalley/models.py
@@ -70,6 +70,7 @@ class createOrderDetails(BaseModel):
 
 class createOrder(BaseModel):
     wallet: str = Query(...)
+    username: str = Query(None)
     pubkey: str = Query(None)
     shippingzone: str = Query(...)
     address: str = Query(...)
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html b/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
deleted file mode 100644
index adbdb047..00000000
--- a/lnbits/extensions/diagonalley/templates/diagonalley/chat.html
+++ /dev/null
@@ -1,317 +0,0 @@
-{% extends "public.html" %} {% block page %}
-<div class="row q-col-gutter-md flex">
-  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
-    <q-card>
-      <div class="chat-container q-pa-md">
-        <div class="chat-box">
-          <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
-          <div class="chat-messages">
-            <q-chat-message
-              :key="index"
-              v-for="(message, index) in messages"
-              :name="message.pubkey == user.keys.publickey ? 'me' : 'merchant'"
-              :text="[message.msg]"
-              :sent="message.pubkey == user.keys.publickey ? true : false"
-              :bg-color="message.pubkey == user.keys.publickey ? 'white' : 'light-green-2'"
-            />
-          </div>
-        </div>
-        <q-form @submit="sendMessage" class="full-width chat-input">
-          <q-input
-            ref="newMessage"
-            v-model="newMessage"
-            placeholder="Message"
-            class="full-width"
-            dense
-            outlined
-          >
-            <template>
-              <q-btn
-                round
-                dense
-                flat
-                type="submit"
-                icon="send"
-                color="primary"
-              />
-            </template>
-          </q-input>
-        </q-form>
-      </div>
-    </q-card>
-  </div>
-  <div class="col-12 col-md-5 col-lg-6 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        {% raw %}
-        <h6 class="text-subtitle1 q-my-none">{{ stall.name }}</h6>
-        <p @click="copyText(stall.publickey)" style="width: max-content">
-          Public Key: {{ sliceKey(stall.publickey) }}
-          <q-tooltip>Click to copy</q-tooltip>
-        </p>
-        {% endraw %}
-      </q-card-section>
-      <q-card-section v-if="user">
-        <q-form @submit="" class="q-gutter-md">
-          <!-- <q-select
-            filled
-            dense
-            emit-value
-            v-model="model"
-            :options="mockMerch"
-            label="Merchant"
-            hint="Select a merchant you've opened an order to"
-          ></q-select>
-          <br /> -->
-          <q-select
-            filled
-            dense
-            emit-value
-            v-model="selectedOrder"
-            :options="user.orders"
-            label="Order"
-            hint="Select an order from this merchant"
-            @input="val => { changeOrder() }"
-          ></q-select>
-        </q-form>
-      </q-card-section>
-      <q-card-section>
-        <q-separator></q-separator>
-        <p>
-          Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
-          quasi.
-        </p>
-        <div v-if="user?.keys" class="row">
-          <div
-            class="col-6"
-            v-for="type in ['publickey', 'privatekey']"
-            v-bind:key="type"
-          >
-            <div class="text-center q-mb-lg">
-              {% raw %}
-              <q-responsive :ratio="1" class="q-mx-xl">
-                <qrcode
-                  :value="user.keys[type]"
-                  :options="{width: 250}"
-                  class="rounded-borders"
-                ></qrcode>
-                <q-tooltip>{{ user.keys[type] }}</q-tooltip>
-              </q-responsive>
-              <p>{{ type == 'publickey' ? 'Public Key' : 'Private Key' }}</p>
-              {% endraw %}
-            </div>
-          </div>
-        </div>
-        <p>
-          Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
-          quasi.
-        </p>
-      </q-card-section>
-      <q-card-section>
-        <q-separator></q-separator>
-        <div class="row q-mt-lg">
-          <q-btn outline color="grey" @click=""
-            >Backup keys
-            <q-tooltip>Download your keys</q-tooltip>
-          </q-btn>
-          <q-btn @click="" v-close-popup flat color="grey" class="q-ml-auto"
-            >Delete data
-            <q-tooltip>Delete all data from browser</q-tooltip>
-          </q-btn>
-        </div>
-      </q-card-section>
-    </q-card>
-  </div>
-</div>
-{% endblock %} {% block scripts %}
-<script>
-  const mapChatMsg = msg => {
-    let obj = {}
-    obj.timestamp = {
-      msg: msg,
-      pubkey: pubkey
-    }
-    return obj
-  }
-  Vue.component(VueQrcode.name, VueQrcode)
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        newMessage: '',
-        showMessages: false,
-        messages: {},
-        stall: null,
-        selectedOrder: null,
-        orders: [],
-        user: null,
-        // Mock data
-        model: null,
-        mockMerch: ['Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'],
-        mockOrder: ['1', '2', '3']
-      }
-    },
-    computed: {},
-    methods: {
-      clearMessage() {
-        this.newMessage = ''
-        this.$refs.newMessage.focus()
-      },
-      sendMessage() {
-        let message = {
-          msg: this.newMessage,
-          pubkey: this.user.keys.publickey
-        }
-        ws.send(JSON.stringify(message))
-
-        this.clearMessage()
-      },
-      sliceKey(key) {
-        if (!key) return ''
-        return `${key.slice(0, 4)}...${key.slice(-4)}`
-      },
-      async generateKeys() {
-        await LNbits.api
-          .request('GET', '/diagonalley/api/v1/keys', null)
-          .then(response => {
-            if (response.data) {
-              let data = {
-                keys: {
-                  privatekey: response.data.privkey,
-                  publickey: response.data.pubkey
-                }
-              }
-              this.user = data
-              console.log('Keys done', this.user)
-              return
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      async getMessages(room_name, all = false) {
-        await LNbits.api
-          .request(
-            'GET',
-            `/diagonalley/api/v1/chat/messages/${room_name}${
-              all ? '?all_messages=true' : ''
-            }`
-          )
-          .then(response => {
-            if (response.data) {
-              console.log(response.data)
-              response.data.reverse().map(m => {
-                this.$set(this.messages, m.timestamp * 1000, {
-                  msg: m.msg,
-                  pubkey: m.pubkey
-                })
-              })
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      changeOrder() {
-        console.log(this.selectedOrder)
-      },
-      startChat(room_name) {
-        if (location.protocol == 'https:') {
-          ws_scheme = 'wss://'
-        } else {
-          ws_scheme = 'ws://'
-        }
-        ws = new WebSocket(
-          ws_scheme + location.host + '/diagonalley/ws/' + room_name
-        )
-
-        function checkWebSocket(event) {
-          if (ws.readyState === WebSocket.CLOSED) {
-            console.log('WebSocket CLOSED: Reopening')
-            ws = new WebSocket(
-              ws_scheme + location.host + '/diagonalley/ws/' + room_name
-            )
-          }
-        }
-
-        ws.onmessage = event => {
-          let event_data = JSON.parse(event.data)
-
-          this.$set(this.messages, Date.now(), event_data)
-        }
-
-        this.ws = ws
-      }
-    },
-    async created() {
-      this.stall = JSON.parse('{{ stall | tojson }}')
-
-      let order_details = JSON.parse('{{ order | tojson }}')
-      let order_id = order_details[0].order_id
-
-      let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
-
-      try {
-        if (data) {
-          this.user = data
-          //add chat key (merchant pubkey) if not set
-          if (!this.user.chats[`${order_id}`]) {
-            this.$set(this.user.chats, order_id, [])
-          }
-          //this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
-        } else {
-          // generate keys
-          await this.generateKeys()
-          // populate user data
-          this.user.chats = {
-            [`${order_id}`]: []
-          }
-          this.user.orders = []
-        }
-
-        this.order_details = order_details
-        this.user.orders = [...new Set([...this.user.orders, order_id])]
-        this.selectedOrder = order_id
-
-        await this.getMessages(order_id)
-
-        this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
-        this.startChat(order_id)
-      } catch (e) {
-        console.error(e)
-      }
-    }
-  })
-</script>
-<style scoped>
-  .chat-container {
-    position: relative;
-    display: grid;
-    grid-template-rows: 1fr auto;
-    height: calc(100vh - 133px);
-  }
-
-  .chat-box {
-    display: flex;
-    flex-direction: column-reverse;
-    padding: 1rem;
-    overflow-y: auto;
-  }
-
-  .chat-messages {
-    width: auto;
-  }
-
-  .chat-other {
-  }
-
-  .chat-input {
-    position: relative;
-    display: flex;
-    align-items: end;
-    margin-top: 1rem;
-  }
-</style>
-{% endblock %}
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 1addb8a7..27875287 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -20,6 +20,7 @@ from .crud import (
     get_diagonalley_market,
     get_diagonalley_market_stalls,
     get_diagonalley_order_details,
+    get_diagonalley_order_invoiceid,
     get_diagonalley_products,
     get_diagonalley_stall,
     get_diagonalley_zone,
@@ -92,13 +93,15 @@ async def display(request: Request, market_id):
     )
 
 
-@diagonalley_ext.get("/chat", response_class=HTMLResponse)
-async def chat_page(request: Request, merch: str = Query(...), order: str = Query(...)):
+@diagonalley_ext.get("/order", response_class=HTMLResponse)
+async def chat_page(request: Request, merch: str = Query(...), invoice_id: str = Query(...)):
     stall = await get_diagonalley_stall(merch)
-    _order = await get_diagonalley_order_details(order)
+    order = await get_diagonalley_order_invoiceid(invoice_id)
+    _order = await get_diagonalley_order_details(order.id)
+    products = await get_diagonalley_products(stall.id)
 
     return diagonalley_renderer().TemplateResponse(
-        "diagonalley/chat.html",
+        "diagonalley/order.html",
         {
             "request": request,
             "stall": {
@@ -107,7 +110,9 @@ async def chat_page(request: Request, merch: str = Query(...), order: str = Quer
                 "publickey": stall.publickey,
                 "wallet": stall.wallet,
             },
+            "order_id": order.id,
             "order": [details.dict() for details in _order],
+            "products": [product.dict() for product in products]
         },
     )
 

From ebe8d8b0b983eb16257ca66b0d3c1720a0816980 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 19 Oct 2022 22:07:38 +0100
Subject: [PATCH 105/174] just for bragging...

---
 lnbits/extensions/diagonalley/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/diagonalley/config.json b/lnbits/extensions/diagonalley/config.json
index 8ad41727..194949d0 100644
--- a/lnbits/extensions/diagonalley/config.json
+++ b/lnbits/extensions/diagonalley/config.json
@@ -2,5 +2,5 @@
   "name": "Diagon Alley",
   "short_description": "Nostr shop system",
   "icon": "add_shopping_cart",
-  "contributors": ["benarc"]
+  "contributors": ["benarc", "talvasconcelos"]
 }

From 532e12ec831b1a5908081edb5f32e95945e23023 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 19 Oct 2022 22:08:48 +0100
Subject: [PATCH 106/174] merchant chat functional almost out of WIP

---
 lnbits/extensions/diagonalley/crud.py         |  13 +
 lnbits/extensions/diagonalley/notifier.py     |   2 +-
 .../templates/diagonalley/index.html          | 389 +++++++++++++++---
 .../templates/diagonalley/order.html          |  52 +--
 .../templates/diagonalley/stall.html          |  16 +-
 lnbits/extensions/diagonalley/views.py        |  45 +-
 lnbits/extensions/diagonalley/views_api.py    |  23 +-
 7 files changed, 461 insertions(+), 79 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index f093ba69..8dadb739 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -408,8 +408,10 @@ async def create_diagonalley_market_stalls(
 async def update_diagonalley_market(market_id):
     pass
 
+
 ### CHAT / MESSAGES
 
+
 async def create_chat_message(data: CreateChatMessage):
     print("DATA", data)
     await db.execute(
@@ -441,3 +443,14 @@ async def get_diagonalley_chat_messages(room_name: str):
     )
 
     return [ChatMessage(**row) for row in rows]
+
+
+async def get_diagonalley_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
+
+    q = ",".join(["?"] * len(ids))
+    rows = await db.fetchall(
+        f"SELECT * FROM diagonalley.messages WHERE id_conversation IN ({q})",
+        (*ids,),
+    )
+    print(ids, q, rows)
+    return [ChatMessage(**row) for row in rows]
diff --git a/lnbits/extensions/diagonalley/notifier.py b/lnbits/extensions/diagonalley/notifier.py
index e21be500..08badfc7 100644
--- a/lnbits/extensions/diagonalley/notifier.py
+++ b/lnbits/extensions/diagonalley/notifier.py
@@ -78,9 +78,9 @@ class Notifier:
 
     async def _notify(self, message: str, room_name: str):
         """Notifier"""
-
         d = json.loads(message)
         d["room_name"] = room_name
+        print("hey", d)
         db_msg = CreateChatMessage.parse_obj(d)
         print("NOT:", db_msg)
         await create_chat_message(data=db_msg)
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 5ad6f6a5..f898fd40 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -345,20 +345,6 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn
-          unelevated
-          v-if="stalls.length > 0"
-          color="primary"
-          @click="productDialog.show = true"
-          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
-        >
-        <q-btn
-          unelevated
-          v-else
-          color="primary"
-          @click="errorMessage('First set shipping zone(s), then create a stall.')"
-          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
-        >
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
@@ -382,7 +368,26 @@
             Create a market stall to list products on
           </q-tooltip></q-btn
         >
-        <q-btn unelevated color="primary" @click="marketDialog.show = true"
+        <q-btn
+          unelevated
+          v-if="stalls.length > 0"
+          color="primary"
+          @click="productDialog.show = true"
+          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
+        >
+        <q-btn
+          unelevated
+          v-else
+          color="primary"
+          @click="errorMessage('First set shipping zone(s), then create a stall.')"
+          >+ Product <q-tooltip> List a product </q-tooltip></q-btn
+        >
+        <q-btn
+          class="float-right"
+          unelevated
+          flat
+          color="primary"
+          @click="marketDialog.show = true"
           >Create Market
           <q-tooltip>
             Makes a simple frontend shop for your stalls (not NOSTR)</q-tooltip
@@ -415,6 +420,7 @@
           {% raw %}
           <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">
                 {{ col.label }}
@@ -434,6 +440,23 @@
                   :icon="props.expand ? 'remove' : 'add'"
                 />
               </q-td>
+              <q-td auto-width>
+                <q-btn
+                  size="sm"
+                  color="green"
+                  dense
+                  icon="chat"
+                  @click="chatRoom(props.row.invoiceid)"
+                >
+                  <q-badge
+                    v-if="props.row.unread"
+                    color="red"
+                    rounded
+                    floating
+                    style="padding: 6px; border-radius: 6px"
+                  />
+                </q-btn>
+              </q-td>
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 {{ col.value }}
               </q-td>
@@ -824,22 +847,114 @@
         <q-list> {% include "diagonalley/_api_docs.html" %} </q-list>
       </q-card-section>
     </q-card>
+    <!-- CHAT BOX -->
     <q-card>
       <q-card-section>
         <h6 class="text-subtitle1 q-my-none">Messages</h6>
       </q-card-section>
       <q-card-section class="q-pa-none">
         <q-separator></q-separator>
-
-        <div class="column q-ma-md q-pb-lg" style="height: 350px">
-          <div class="col q-pb-md">
+      </q-card-section>
+      <q-card-section>
+        <q-select
+          v-model="customerKey"
+          :options="Object.keys(messages)"
+          label="Customers"
+          @input="chatRoom(customerKey)"
+        ></q-select>
+      </q-card-section>
+      <div class="chat-container q-pa-md" ref="chatCard">
+        <div class="chat-box">
+          <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
+          <div class="chat-messages">
+            <q-chat-message
+              :key="index"
+              v-for="(message, index) in orderMessages"
+              :name="message.pubkey == keys.pubkey ? 'me' : 'customer'"
+              :text="[message.msg]"
+              :sent="message.pubkey == keys.pubkey ? true : false"
+              :bg-color="message.pubkey == keys.pubkey ? 'white' : 'light-green-2'"
+            />
+          </div>
+        </div>
+        <q-form @submit="sendMessage" class="full-width chat-input">
+          <q-input
+            ref="newMessage"
+            v-model="newMessage"
+            placeholder="Message"
+            class="full-width"
+            dense
+            outlined
+          >
+            <template>
+              <q-btn
+                round
+                dense
+                flat
+                type="submit"
+                icon="send"
+                color="primary"
+              />
+            </template>
+          </q-input>
+        </q-form>
+      </div>
+    </q-card>
+    <!-- <q-card>
+      <q-card-section>
+        <h6 class="text-subtitle1 q-my-none">Messages</h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none">
+        <q-separator></q-separator>
+        <div
+          ref="chatCard"
+          class="q-ma-md q-pb-lg"
+          style="height: 350px"
+        >
+          <div class="q-pb-md">
             <q-select
               v-model="customerKey"
               style="width: 80%"
-              :options="customerKeys"
+              :options="Object.keys(messages)"
               label="Customers"
-              @input="getMessages(customerKey)"
+              @input="chatRoom(customerKey)"
             ></q-select>
+            <div class="chat-container q-pa-md"> 
+              <div class="chat-box">
+                <p v-if="Object.keys(messages).length === 0">No messages yet</p>
+                <div class="chat-messages">
+                  <q-chat-message
+                    :key="index"
+                    v-for="(message, index) in orderMessages"
+                    :name="message.pubkey == keys.pubkey ? 'me' : 'customer'"
+                    :text="[message.msg]"
+                    :sent="message.pubkey == keys.pubkey ? true : false"
+                    :bg-color="message.pubkey == keys.pubkey ? 'white' : 'light-green-2'"
+                  />
+                </div>
+              </div>
+              <q-form @submit="sendMessage" class="full-width chat-input">
+                <q-input
+                  ref="newMessage"
+                  v-model="newMessage"
+                  placeholder="Message"
+                  class="full-width"
+                  dense
+                  outlined
+                >
+                  <template>
+                    <q-btn
+                      round
+                      dense
+                      flat
+                      type="submit"
+                      icon="send"
+                      color="primary"
+                    />
+                  </template>
+                </q-input>
+              </q-form>
+            </div>
           </div>
           <div class="col-8 q-px-md">
             <div v-for="message in customerMessages">
@@ -860,11 +975,10 @@
           </div>
         </div>
       </q-card-section>
-    </q-card>
+    </q-card> -->
   </div>
 </div>
-<!-- </div>
-</div> -->
+
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
 
@@ -873,6 +987,15 @@
 
   const pica = window.pica()
 
+  function imgSizeFit(img, maxWidth = 1024, maxHeight = 768) {
+    let ratio = Math.min(
+      1,
+      maxWidth / img.naturalWidth,
+      maxHeight / img.naturalHeight
+    )
+    return {width: img.naturalWidth * ratio, height: img.naturalHeight * ratio}
+  }
+
   const mapStalls = obj => {
     obj._data = _.clone(obj)
     return obj
@@ -891,6 +1014,7 @@
       new Date(obj.time * 1000),
       'YYYY-MM-DD HH:mm'
     )
+    // obj.unread = false
     return obj
   }
   const mapKeys = obj => {
@@ -933,8 +1057,12 @@
         customerKeys: [],
         customerKey: '',
         customerMessages: {},
+        messages: {},
+        newMessage: '',
+        orderMessages: {},
         shippedModel: false,
         shippingZoneOptions: [
+          'Free (digital)',
           'Worldwide',
           'Europe',
           'Australia',
@@ -999,17 +1127,17 @@
         ordersTable: {
           columns: [
             /*{
-              name: 'product',
-              align: 'left',
-              label: 'Product',
-              field: 'product'
-            },
-            {
-              name: 'quantity',
-              align: 'left',
-              label: 'Quantity',
-              field: 'quantity'
-            },*/
+            name: 'product',
+            align: 'left',
+            label: 'Product',
+            field: 'product'
+          },
+          {
+            name: 'quantity',
+            align: 'left',
+            label: 'Quantity',
+            field: 'quantity'
+          },*/
             {
               name: 'id',
               align: 'left',
@@ -1443,9 +1571,10 @@
         let image = new Image()
         image.src = blobURL
         image.onload = async () => {
+          let fit = imgSizeFit(image)
           let canvas = document.createElement('canvas')
-          canvas.setAttribute('width', 760)
-          canvas.setAttribute('height', 490)
+          canvas.setAttribute('width', fit.width)
+          canvas.setAttribute('height', fit.height)
           await pica.resize(image, canvas, {
             quality: 0,
             alpha: true,
@@ -1657,7 +1786,7 @@
           .then(response => {
             if (response.data) {
               this.markets = response.data.map(mapMarkets)
-              console.log(this.markets)
+              // console.log(this.markets)
             }
           })
           .catch(error => {
@@ -1756,10 +1885,10 @@
       ////////////////////////////////////////
       ////////////////ORDERS//////////////////
       ////////////////////////////////////////
-      getOrders: function () {
+      getOrders: async function () {
         var self = this
 
-        LNbits.api
+        await LNbits.api
           .request(
             'GET',
             '/diagonalley/api/v1/orders?all_wallets=true',
@@ -1768,7 +1897,6 @@
           .then(function (response) {
             if (response.data) {
               self.orders = response.data.map(mapOrders)
-              console.log(self.orders)
             }
           })
           .catch(function (error) {
@@ -1839,21 +1967,190 @@
       },
       exportOrdersCSV: function () {
         LNbits.utils.exportCSV(this.ordersTable.columns, this.orders)
+      },
+      /// CHAT
+      async getAllMessages() {
+        await LNbits.api
+          .request(
+            'GET',
+            `/diagonalley/api/v1/chat/messages/merchant?orders=${this.orders
+              .map(o => o.invoiceid)
+              .toString()}`,
+            this.g.user.wallets[0].adminkey
+          )
+          .then(res => {
+            this.messages = _.groupBy(res.data, 'id_conversation')
+            this.checkUnreadMessages()
+            console.log('Get new messages!')
+          })
+          .catch(error => {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      updateLastSeenMsg(id) {
+        let data = this.$q.localStorage.getItem(
+          `lnbits.diagonalley.${this.g.user.id}`
+        )
+        let chat = {
+          ...data.chat,
+          [`${id}`]: {
+            timestamp: Object.keys(this.orderMessages)[
+              Object.keys(this.orderMessages).length - 1
+            ]
+          }
+        }
+        console.log({chat})
+        this.$q.localStorage.set(`lnbits.diagonalley.${this.g.user.id}`, {
+          ...data,
+          chat
+        })
+        this.checkUnreadMessages()
+      },
+      checkUnreadMessages() {
+        let lastMsgs = this.$q.localStorage.getItem(
+          `lnbits.diagonalley.${this.g.user.id}`
+        ).chat
+        for (let key in this.messages) {
+          let idx = this.orders.findIndex(f => f.invoiceid == key)
+          if (!lastMsgs[key]) {
+            this.updateLastSeenMsg(key)
+            //this.orders[idx].unread = true
+            return
+          }
+          console.log(
+            'Key',
+            key,
+            'saved:',
+            lastMsgs[key].timestamp,
+            'messages: ',
+            Math.max(...this.messages[key].map(c => c.timestamp)),
+            lastMsgs[key].timestamp <
+              Math.max(...this.messages[key].map(c => c.timestamp))
+          )
+          if (
+            lastMsgs[key].timestamp <
+            Math.max(...this.messages[key].map(c => c.timestamp))
+          ) {
+            this.$set(this.orders[idx], 'unread', true)
+            // this.orders[idx].unread = true
+          } else {
+            this.$set(this.orders[idx], 'unread', false)
+            // this.orders[idx].unread = false
+          }
+          console.log('Order:', this.orders[idx])
+        }
+      },
+      clearMessage() {
+        this.newMessage = ''
+        this.$refs.newMessage.focus()
+      },
+      sendMessage() {
+        let message = {
+          msg: this.newMessage,
+          pubkey: this.keys.pubkey
+        }
+        this.ws.send(JSON.stringify(message))
+
+        this.clearMessage()
+      },
+      chatRoom(id) {
+        this.startChat(id)
+        this.orderMessages = {}
+        this.messages[id].map(m => {
+          this.$set(this.orderMessages, m.timestamp, {
+            msg: m.msg,
+            pubkey: m.pubkey
+          })
+        })
+        this.$refs.chatCard.scrollIntoView({
+          behavior: 'smooth',
+          inline: 'nearest'
+        })
+        this.updateLastSeenMsg(id)
+        //"ea2fbf6c91aa228603681e2cc34bb06e34e6d1375fa4d6c35756182b2fa3307f"
+        //"c7435a04875c26e28db91a377bd6e991dbfefeefea8258415f3ae0c716ed2335"
+      },
+      startChat(room_name) {
+        if (this.ws) {
+          this.ws.close()
+        }
+        if (location.protocol == 'https:') {
+          ws_scheme = 'wss://'
+        } else {
+          ws_scheme = 'ws://'
+        }
+        ws = new WebSocket(
+          ws_scheme + location.host + '/diagonalley/ws/' + room_name
+        )
+
+        function checkWebSocket(event) {
+          if (ws.readyState === WebSocket.CLOSED) {
+            console.log('WebSocket CLOSED: Reopening')
+            ws = new WebSocket(
+              ws_scheme + location.host + '/diagonalley/ws/' + room_name
+            )
+          }
+        }
+
+        ws.onmessage = event => {
+          let event_data = JSON.parse(event.data)
+
+          this.$set(this.orderMessages, Date.now(), event_data)
+          this.updateLastSeenMsg(room_name)
+        }
+
+        ws.onclose = event => {
+          this.updateLastSeenMsg(room_name)
+        }
+
+        this.ws = ws
       }
     },
-    created: function () {
+    async created() {
       if (this.g.user.wallets.length) {
         this.getStalls()
         this.getProducts()
         this.getZones()
-        this.getOrders()
+        await this.getOrders()
         this.getMarkets()
-        this.customerKeys = [
-          'cb4c0164fe03fcdadcbfb4f76611c71620790944c24f21a1cd119395cdedfe1b',
-          'a9c17358a6dc4ceb3bb4d883eb87967a66b3453a0f3199f0b1c8eef8070c6a07'
-        ]
+        await this.getAllMessages()
+        let keys = this.$q.localStorage.getItem(
+          `lnbits.diagonalley.${this.g.user.id}`
+        )
+        if (keys) {
+          this.keys = keys
+        }
+        setInterval(() => {
+          this.getAllMessages()
+        }, 300000)
       }
     }
   })
 </script>
+<style scoped>
+  .chat-container {
+    position: relative;
+    display: grid;
+    grid-template-rows: 1fr auto;
+    height: calc(100vh - 140px);
+  }
+
+  .chat-box {
+    display: flex;
+    flex-direction: column-reverse;
+    padding: 1rem;
+    overflow-y: auto;
+  }
+
+  .chat-messages {
+    width: auto;
+  }
+
+  .chat-input {
+    position: relative;
+    display: flex;
+    align-items: end;
+    margin-top: 1rem;
+  }
+</style>
 {% endblock %}
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
index aa9d0de4..81cdfc36 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -68,7 +68,7 @@
             dense
             emit-value
             v-model="selectedOrder"
-            :options="user.orders"
+            :options="Object.keys(user.orders)"
             label="Order"
             hint="Select an order from this merchant"
             @input="val => { changeOrder() }"
@@ -187,7 +187,7 @@
           msg: this.newMessage,
           pubkey: this.user.keys.publickey
         }
-        ws.send(JSON.stringify(message))
+        this.ws.send(JSON.stringify(message))
 
         this.clearMessage()
       },
@@ -236,10 +236,16 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      changeOrder() {
-        console.log(this.selectedOrder)
+      async changeOrder() {
+        this.products = this.user.orders[this.selectedOrder]
+        this.messages = {}
+        await this.getMessages(this.selectedOrder)
+        this.startChat(this.selectedOrder)
       },
       startChat(room_name) {
+        if (this.ws) {
+          this.ws.close()
+        }
         if (location.protocol == 'https:') {
           ws_scheme = 'wss://'
         } else {
@@ -268,51 +274,51 @@
       }
     },
     async created() {
-      this.stall = JSON.parse('{{ stall | tojson }}')
       let order_details = JSON.parse('{{ order | tojson }}')
       let products = JSON.parse('{{ products | tojson }}')
-
       let order_id = '{{ order_id }}'
 
+      this.stall = JSON.parse('{{ stall | tojson }}')
+      this.products = order_details.map(o => {
+        let product = products.find(p => p.id == o.product_id)
+        return {
+          quantity: o.quantity,
+          name: product.product,
+          image: product.image,
+          price: product.price
+        }
+      })
+
       let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
 
       try {
         if (data) {
           this.user = data
           //add chat key (merchant pubkey) if not set
-          if (!this.user.chats[`${order_id}`]) {
-            this.$set(this.user.chats, order_id, [])
+          if (!this.user.orders[`${order_id}`]) {
+            this.$set(this.user.orders, order_id, this.products)
           }
           //this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
         } else {
           // generate keys
           await this.generateKeys()
           // populate user data
-          this.user.chats = {
-            [`${order_id}`]: []
+          this.user.orders = {
+            [`${order_id}`]: this.products
           }
-          this.user.orders = []
+          //this.user.orders = []
         }
 
-        this.order_details = order_details
-        this.products = order_details.map(o => {
-          let product = products.find(p => p.id == o.product_id)
-          return {
-            quantity: o.quantity,
-            name: product.product,
-            image: product.image,
-            price: product.price
-          }
-        })
+        //this.order_details = order_details
 
-        this.user.orders = [...new Set([...this.user.orders, order_id])]
+        //this.user.orders = [...new Set([...this.user.orders, order_id])]
         this.selectedOrder = order_id
 
         await this.getMessages(order_id)
 
         this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
         this.startChat(order_id)
-        console.log(this.products)
+        console.log(this.messages)
       } catch (e) {
         console.error(e)
       }
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index a3a04b1e..05163573 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -125,7 +125,7 @@
           >
         </div>
         <div v-if="item.categories" class="text-subtitle1">
-          <q-chip v-for="cat in item.categories.split(',')" dense
+          <q-chip v-for="(cat, i) in item.categories.split(',')" :key="i" dense
             >{{cat}}</q-chip
           >
         </div>
@@ -409,8 +409,18 @@
                   if (res.data.paid) {
                     this.$q.notify({
                       type: 'positive',
-                      message: 'Sats received, thanks!',
-                      icon: 'thumb_up'
+                      multiLine: true,
+                      message:
+                        "Sats received, thanks! You'l be redirected to the order page...",
+                      icon: 'thumb_up',
+                      actions: [
+                        {
+                          label: 'See Order',
+                          handler: () => {
+                            window.location.href = `/diagonalley/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
+                          }
+                        }
+                      ]
                     })
                     clearInterval(this.qrCodeDialog.paymentChecker)
                     this.resetCart()
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 27875287..2bf98211 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -94,7 +94,9 @@ async def display(request: Request, market_id):
 
 
 @diagonalley_ext.get("/order", response_class=HTMLResponse)
-async def chat_page(request: Request, merch: str = Query(...), invoice_id: str = Query(...)):
+async def chat_page(
+    request: Request, merch: str = Query(...), invoice_id: str = Query(...)
+):
     stall = await get_diagonalley_stall(merch)
     order = await get_diagonalley_order_invoiceid(invoice_id)
     _order = await get_diagonalley_order_details(order.id)
@@ -110,9 +112,9 @@ async def chat_page(request: Request, merch: str = Query(...), invoice_id: str =
                 "publickey": stall.publickey,
                 "wallet": stall.wallet,
             },
-            "order_id": order.id,
+            "order_id": order.invoiceid,
             "order": [details.dict() for details in _order],
-            "products": [product.dict() for product in products]
+            "products": [product.dict() for product in products],
         },
     )
 
@@ -123,6 +125,41 @@ async def chat_page(request: Request, merch: str = Query(...), invoice_id: str =
 notifier = Notifier()
 
 
+# class ConnectionManager:
+#     def __init__(self):
+#         self.active_connections: List[WebSocket] = []
+
+#     async def connect(self, websocket: WebSocket, room_name: str):
+#         await websocket.accept()
+#         websocket.id = room_name
+#         self.active_connections.append(websocket)
+
+#     def disconnect(self, websocket: WebSocket):
+#         self.active_connections.remove(websocket)
+
+#     async def send_personal_message(self, message: str, room_name: str):
+#         for connection in self.active_connections:
+#             if connection.id == room_name:
+#                 await connection.send_text(message)
+
+#     async def broadcast(self, message: str):
+#         for connection in self.active_connections:
+#             await connection.send_text(message)
+
+
+# manager = ConnectionManager()
+
+
+# @diagonalley_ext.websocket("/ws/{room_name}")
+# async def websocket_endpoint(websocket: WebSocket, room_name: str):
+#     await manager.connect(websocket, room_name)
+#     try:
+#         while True:
+#             data = await websocket.receive_text()
+#     except WebSocketDisconnect:
+#         manager.disconnect(websocket)
+
+
 @diagonalley_ext.websocket("/ws/{room_name}")
 async def websocket_endpoint(
     websocket: WebSocket, room_name: str, background_tasks: BackgroundTasks
@@ -143,7 +180,7 @@ async def websocket_endpoint(
             if websocket not in room_members:
                 print("Sender not in room member: Reconnecting...")
                 await notifier.connect(websocket, room_name)
-
+            print("ENDPOINT", data)
             await notifier._notify(data, room_name)
 
     except WebSocketDisconnect:
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index f84ea8e9..2f375357 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -1,10 +1,10 @@
 from base64 import urlsafe_b64encode
 from http import HTTPStatus
-from typing import List
+from typing import List, Union
 from uuid import uuid4
 
 from fastapi import Request
-from fastapi.param_functions import Query
+from fastapi.param_functions import Body, Query
 from fastapi.params import Depends
 from loguru import logger
 from secp256k1 import PrivateKey, PublicKey
@@ -34,6 +34,7 @@ from .crud import (
     delete_diagonalley_product,
     delete_diagonalley_stall,
     delete_diagonalley_zone,
+    get_diagonalley_chat_by_merchant,
     get_diagonalley_chat_messages,
     get_diagonalley_latest_chat_messages,
     get_diagonalley_market,
@@ -255,6 +256,14 @@ async def api_diagonalley_orders(
         return {"message": "We could not retrieve the orders."}
 
 
+@diagonalley_ext.get("/api/v1/orders/{order_id}")
+async def api_diagonalley_order_by_id(order_id: str):
+    order = (await get_diagonalley_order(order_id)).dict()
+    order["details"] = await get_diagonalley_order_details(order_id)
+
+    return order
+
+
 @diagonalley_ext.post("/api/v1/orders")
 async def api_diagonalley_order_create(data: createOrder):
     ref = urlsafe_short_hash()
@@ -488,6 +497,16 @@ async def api_diagonalley_generate_keys():
 ## MESSAGES/CHAT
 
 
+@diagonalley_ext.get("/api/v1/chat/messages/merchant")
+async def api_get_merchant_messages(
+    orders: str = Query(...), wallet: WalletTypeInfo = Depends(require_admin_key)
+):
+
+    return [
+        msg.dict() for msg in await get_diagonalley_chat_by_merchant(orders.split(","))
+    ]
+
+
 @diagonalley_ext.get("/api/v1/chat/messages/{room_name}")
 async def api_get_latest_chat_msg(room_name: str, all_messages: bool = Query(False)):
     if all_messages:

From 4dcb8d2ca047477f66b5a562735c85a2b1d52239 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 25 Oct 2022 11:55:55 +0100
Subject: [PATCH 107/174] redirect to order page

---
 lnbits/extensions/diagonalley/templates/diagonalley/stall.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 05163573..1299f694 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -425,6 +425,9 @@
                     clearInterval(this.qrCodeDialog.paymentChecker)
                     this.resetCart()
                     this.closeQrCodeDialog()
+                    setTimeout(() => {
+                      window.location.href = `/diagonalley/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
+                    }, 5000)
                   }
                 })
                 .catch(error => {

From 227eaeae75f7228934127fc114fffa1bff4e301f Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 25 Oct 2022 11:57:01 +0100
Subject: [PATCH 108/174] some cleanup

---
 .../templates/diagonalley/index.html          | 34 ++++++++-----------
 lnbits/extensions/diagonalley/views_api.py    |  4 +--
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index f898fd40..0882fd2f 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -580,6 +580,7 @@
             <q-tr :props="props">
               <q-td auto-width>
                 <q-btn
+                  disabled
                   unelevated
                   dense
                   size="xs"
@@ -670,7 +671,7 @@
                   :href="'/diagonalley/stalls/' + props.row.id"
                   target="_blank"
                 ></q-btn>
-                <q-tooltip> Link to pass to stall relay </q-tooltip>
+                <q-tooltip> Stall simple UI shopping cart </q-tooltip>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 {{ col.value }}
@@ -1952,17 +1953,22 @@
               })
           })
       },
-      shipOrder: function (order_id) {
-        var self = this
-
+      shipOrder(order_id){
         LNbits.api
           .request(
             'GET',
             '/diagonalley/api/v1/orders/shipped/' + order_id,
             this.g.user.wallets[0].inkey
           )
-          .then(function (response) {
-            self.orders.push(mapOrders(response.data))
+          .then((response) => {
+            console.log(response.data)
+            this.orders = _.reject(this.orders, (obj) => {
+              return obj.id == order_id
+            })
+            this.orders.push(mapOrders(response.data))
+          })
+          .catch((error) => {
+            LNbits.utils.notifyApiError(error)
           })
       },
       exportOrdersCSV: function () {
@@ -1999,7 +2005,7 @@
             ]
           }
         }
-        console.log({chat})
+        //console.log({chat})
         this.$q.localStorage.set(`lnbits.diagonalley.${this.g.user.id}`, {
           ...data,
           chat
@@ -2014,28 +2020,16 @@
           let idx = this.orders.findIndex(f => f.invoiceid == key)
           if (!lastMsgs[key]) {
             this.updateLastSeenMsg(key)
-            //this.orders[idx].unread = true
             return
           }
-          console.log(
-            'Key',
-            key,
-            'saved:',
-            lastMsgs[key].timestamp,
-            'messages: ',
-            Math.max(...this.messages[key].map(c => c.timestamp)),
-            lastMsgs[key].timestamp <
-              Math.max(...this.messages[key].map(c => c.timestamp))
-          )
+          
           if (
             lastMsgs[key].timestamp <
             Math.max(...this.messages[key].map(c => c.timestamp))
           ) {
             this.$set(this.orders[idx], 'unread', true)
-            // this.orders[idx].unread = true
           } else {
             this.$set(this.orders[idx], 'unread', false)
-            // this.orders[idx].unread = false
           }
           console.log('Order:', this.orders[idx])
         }
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 2f375357..e6a4c2de 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -286,8 +286,6 @@ async def api_diagonalley_order_create(data: createOrder):
         "payment_request": payment_request,
         "order_reference": ref,
     }
-    # order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
-    # return order.dict()
 
 
 @diagonalley_ext.get("/api/v1/orders/payments/{payment_hash}")
@@ -352,7 +350,7 @@ async def api_diagonalley_order_shipped(
         "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
     )
 
-    return [order.dict() for order in get_diagonalley_orders(order["wallet"])]
+    return order
 
 
 ###List products based on stall id

From c282f38726c2b62b4f4588cb665624aeb4fcd0ce Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 25 Oct 2022 12:30:15 +0100
Subject: [PATCH 109/174] cleanup and keys management

---
 .../templates/diagonalley/order.html          | 104 ++++++++++++++++--
 1 file changed, 92 insertions(+), 12 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
index 81cdfc36..fe5c7903 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -133,11 +133,15 @@
       <q-card-section>
         <q-separator></q-separator>
         <div class="row q-mt-lg">
-          <q-btn outline color="grey" @click=""
+          <q-btn outline color="grey" @click="downloadKeys"
             >Backup keys
             <q-tooltip>Download your keys</q-tooltip>
           </q-btn>
-          <q-btn @click="" v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn outline color="grey" class="q-mx-sm" @click="keysDialog.show = true" :disabled="this.user.keys"
+            >Restore keys
+            <q-tooltip>Restore keys</q-tooltip>
+          </q-btn>
+          <q-btn @click="deleteData" v-close-popup flat color="grey" class="q-ml-auto"
             >Delete data
             <q-tooltip>Delete all data from browser</q-tooltip>
           </q-btn>
@@ -145,6 +149,50 @@
       </q-card-section>
     </q-card>
   </div>
+  <!-- RESTORE KEYS DIALOG -->
+  <q-dialog
+    v-model="keysDialog.show"
+    position="top"
+    @hide="clearRestoreKeyDialog"
+  >
+    <q-card
+      class="q-pa-lg q-pt-xl lnbits__dialog-card"
+    >
+    </q-card>
+    <q-card class="q-pa-lg lnbits__dialog-card">
+      <q-form @submit="restoreKeys" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="keysDialog.data.publickey"
+          label="Public Key"
+        ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.trim="keysDialog.data.privatekey"
+          label="Private Key *optional"
+        ></q-input>
+        <div class="row q-mt-lg">
+          <q-btn
+            unelevated
+            color="primary"
+            :disable="keysDialog.data.publickey == null"
+            type="submit"
+            label="Submit"
+            ></q-btn>
+          <q-btn
+            v-close-popup
+            flat
+            @click="clearRestoreKeyDialog"
+            color="grey"
+            class="q-ml-auto"
+            label="Cancel"
+            ></q-btn>
+        </div>
+        </q-form>
+    </q-card>
+  </q-dialog>
 </div>
 {% endblock %} {% block scripts %}
 <script>
@@ -170,10 +218,10 @@
         products: [],
         orders: [],
         user: null,
-        // Mock data
-        model: null,
-        mockMerch: ['Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'],
-        mockOrder: ['1', '2', '3']
+        keysDialog: {
+          show: false,
+          data: {}
+        }
       }
     },
     computed: {},
@@ -182,6 +230,12 @@
         this.newMessage = ''
         this.$refs.newMessage.focus()
       },
+      clearRestoreKeyDialog(){
+        this.keysDialog = {
+          show: false,
+          data: {}
+        }
+      },
       sendMessage() {
         let message = {
           msg: this.newMessage,
@@ -195,6 +249,38 @@
         if (!key) return ''
         return `${key.slice(0, 4)}...${key.slice(-4)}`
       },
+      downloadKeys(){
+        const file = new File([JSON.stringify(this.user.keys)], 'backup_keys.json', {
+          type: 'text/json',
+        })
+        const link = document.createElement('a')
+        const url = URL.createObjectURL(file)
+
+        link.href = url
+        link.download = file.name
+        link.click()
+
+        window.URL.revokeObjectURL(url)
+
+      },
+      restoreKeys(){
+        this.user.keys = this.keysDialog.data
+        let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
+        this.$q.localStorage.set(`lnbits.diagonalley.data`, {
+          ...data,
+          keys: this.user.keys
+        })
+        
+        this.clearRestoreKeyDialog()
+      },
+      deleteData(){
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete your stored data?')
+          .onOk(() => {
+            this.$q.localStorage.remove('lnbits.diagonalley.data')
+            this.user = null
+          })
+      },
       async generateKeys() {
         await LNbits.api
           .request('GET', '/diagonalley/api/v1/keys', null)
@@ -298,7 +384,6 @@
           if (!this.user.orders[`${order_id}`]) {
             this.$set(this.user.orders, order_id, this.products)
           }
-          //this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
         } else {
           // generate keys
           await this.generateKeys()
@@ -306,19 +391,14 @@
           this.user.orders = {
             [`${order_id}`]: this.products
           }
-          //this.user.orders = []
         }
 
-        //this.order_details = order_details
-
-        //this.user.orders = [...new Set([...this.user.orders, order_id])]
         this.selectedOrder = order_id
 
         await this.getMessages(order_id)
 
         this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
         this.startChat(order_id)
-        console.log(this.messages)
       } catch (e) {
         console.error(e)
       }

From f3fc1e4a2bbcfff75fd1e3fbb7469a9949b5fa27 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 25 Oct 2022 12:32:19 +0100
Subject: [PATCH 110/174] format

---
 .../templates/diagonalley/index.html          | 10 ++--
 .../templates/diagonalley/order.html          | 46 +++++++++++--------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 0882fd2f..435735ad 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1953,21 +1953,21 @@
               })
           })
       },
-      shipOrder(order_id){
+      shipOrder(order_id) {
         LNbits.api
           .request(
             'GET',
             '/diagonalley/api/v1/orders/shipped/' + order_id,
             this.g.user.wallets[0].inkey
           )
-          .then((response) => {
+          .then(response => {
             console.log(response.data)
-            this.orders = _.reject(this.orders, (obj) => {
+            this.orders = _.reject(this.orders, obj => {
               return obj.id == order_id
             })
             this.orders.push(mapOrders(response.data))
           })
-          .catch((error) => {
+          .catch(error => {
             LNbits.utils.notifyApiError(error)
           })
       },
@@ -2022,7 +2022,7 @@
             this.updateLastSeenMsg(key)
             return
           }
-          
+
           if (
             lastMsgs[key].timestamp <
             Math.max(...this.messages[key].map(c => c.timestamp))
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
index fe5c7903..90b0b7de 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -137,11 +137,21 @@
             >Backup keys
             <q-tooltip>Download your keys</q-tooltip>
           </q-btn>
-          <q-btn outline color="grey" class="q-mx-sm" @click="keysDialog.show = true" :disabled="this.user.keys"
+          <q-btn
+            outline
+            color="grey"
+            class="q-mx-sm"
+            @click="keysDialog.show = true"
+            :disabled="this.user.keys"
             >Restore keys
             <q-tooltip>Restore keys</q-tooltip>
           </q-btn>
-          <q-btn @click="deleteData" v-close-popup flat color="grey" class="q-ml-auto"
+          <q-btn
+            @click="deleteData"
+            v-close-popup
+            flat
+            color="grey"
+            class="q-ml-auto"
             >Delete data
             <q-tooltip>Delete all data from browser</q-tooltip>
           </q-btn>
@@ -155,10 +165,7 @@
     position="top"
     @hide="clearRestoreKeyDialog"
   >
-    <q-card
-      class="q-pa-lg q-pt-xl lnbits__dialog-card"
-    >
-    </q-card>
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card"> </q-card>
     <q-card class="q-pa-lg lnbits__dialog-card">
       <q-form @submit="restoreKeys" class="q-gutter-md">
         <q-input
@@ -180,7 +187,7 @@
             :disable="keysDialog.data.publickey == null"
             type="submit"
             label="Submit"
-            ></q-btn>
+          ></q-btn>
           <q-btn
             v-close-popup
             flat
@@ -188,9 +195,9 @@
             color="grey"
             class="q-ml-auto"
             label="Cancel"
-            ></q-btn>
+          ></q-btn>
         </div>
-        </q-form>
+      </q-form>
     </q-card>
   </q-dialog>
 </div>
@@ -230,7 +237,7 @@
         this.newMessage = ''
         this.$refs.newMessage.focus()
       },
-      clearRestoreKeyDialog(){
+      clearRestoreKeyDialog() {
         this.keysDialog = {
           show: false,
           data: {}
@@ -249,10 +256,14 @@
         if (!key) return ''
         return `${key.slice(0, 4)}...${key.slice(-4)}`
       },
-      downloadKeys(){
-        const file = new File([JSON.stringify(this.user.keys)], 'backup_keys.json', {
-          type: 'text/json',
-        })
+      downloadKeys() {
+        const file = new File(
+          [JSON.stringify(this.user.keys)],
+          'backup_keys.json',
+          {
+            type: 'text/json'
+          }
+        )
         const link = document.createElement('a')
         const url = URL.createObjectURL(file)
 
@@ -261,19 +272,18 @@
         link.click()
 
         window.URL.revokeObjectURL(url)
-
       },
-      restoreKeys(){
+      restoreKeys() {
         this.user.keys = this.keysDialog.data
         let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
         this.$q.localStorage.set(`lnbits.diagonalley.data`, {
           ...data,
           keys: this.user.keys
         })
-        
+
         this.clearRestoreKeyDialog()
       },
-      deleteData(){
+      deleteData() {
         LNbits.utils
           .confirmDialog('Are you sure you want to delete your stored data?')
           .onOk(() => {

From 82e887b7a816936130cd260d0c7b329afddb34a5 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 11 Nov 2022 12:11:14 +0000
Subject: [PATCH 111/174] clean up and add pubkey to order

---
 lnbits/extensions/diagonalley/crud.py         | 17 +++-
 lnbits/extensions/diagonalley/notifier.py     |  2 -
 .../templates/diagonalley/index.html          | 19 +++--
 .../templates/diagonalley/order.html          | 79 +++++++++--------
 .../templates/diagonalley/stall.html          |  2 -
 lnbits/extensions/diagonalley/views_api.py    | 84 ++++++++++---------
 6 files changed, 109 insertions(+), 94 deletions(-)

diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index 8dadb739..f9601732 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -192,7 +192,6 @@ async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
     row = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
-    print("ROW", row)
     return Stalls(**row) if row else None
 
 
@@ -305,6 +304,20 @@ async def set_diagonalley_order_paid(payment_hash: str) -> Orders:
     )
 
 
+async def set_diagonalley_order_pubkey(payment_hash: str, pubkey: str):
+    await db.execute(
+        """
+            UPDATE diagonalley.orders
+            SET pubkey = ?
+            WHERE invoiceid = ?
+            """,
+        (
+            pubkey,
+            payment_hash,
+        ),
+    )
+
+
 async def update_diagonalley_product_stock(products):
 
     q = "\n".join(
@@ -413,7 +426,6 @@ async def update_diagonalley_market(market_id):
 
 
 async def create_chat_message(data: CreateChatMessage):
-    print("DATA", data)
     await db.execute(
         """
             INSERT INTO diagonalley.messages (msg, pubkey, id_conversation)
@@ -452,5 +464,4 @@ async def get_diagonalley_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
         f"SELECT * FROM diagonalley.messages WHERE id_conversation IN ({q})",
         (*ids,),
     )
-    print(ids, q, rows)
     return [ChatMessage(**row) for row in rows]
diff --git a/lnbits/extensions/diagonalley/notifier.py b/lnbits/extensions/diagonalley/notifier.py
index 08badfc7..f99cc4bf 100644
--- a/lnbits/extensions/diagonalley/notifier.py
+++ b/lnbits/extensions/diagonalley/notifier.py
@@ -80,9 +80,7 @@ class Notifier:
         """Notifier"""
         d = json.loads(message)
         d["room_name"] = room_name
-        print("hey", d)
         db_msg = CreateChatMessage.parse_obj(d)
-        print("NOT:", db_msg)
         await create_chat_message(data=db_msg)
 
         remaining_sessions = []
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 435735ad..5c9b26cc 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -859,9 +859,10 @@
       <q-card-section>
         <q-select
           v-model="customerKey"
-          :options="Object.keys(messages)"
+          :options="Object.keys(messages).map(k => ({label: `${k.slice(0, 25)}...`, value: k}))"
           label="Customers"
           @input="chatRoom(customerKey)"
+          emit-value
         ></q-select>
       </q-card-section>
       <div class="chat-container q-pa-md" ref="chatCard">
@@ -1787,7 +1788,6 @@
           .then(response => {
             if (response.data) {
               this.markets = response.data.map(mapMarkets)
-              // console.log(this.markets)
             }
           })
           .catch(error => {
@@ -1904,7 +1904,7 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      createOrder: function () {
+      /*createOrder: function () {
         var data = {
           address: this.orderDialog.data.address,
           email: this.orderDialog.data.email,
@@ -1929,7 +1929,7 @@
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
-      },
+      },*/
       deleteOrder: function (orderId) {
         var self = this
         var order = _.findWhere(self.orders, {id: orderId})
@@ -1941,7 +1941,7 @@
               .request(
                 'DELETE',
                 '/diagonalley/api/v1/orders/' + orderId,
-                _.findWhere(self.g.user.wallets, {id: order.wallet}).inkey
+                _.findWhere(self.g.user.wallets, {id: order.wallet}).adminkey
               )
               .then(function (response) {
                 self.orders = _.reject(self.orders, function (obj) {
@@ -1961,7 +1961,6 @@
             this.g.user.wallets[0].inkey
           )
           .then(response => {
-            console.log(response.data)
             this.orders = _.reject(this.orders, obj => {
               return obj.id == order_id
             })
@@ -1987,7 +1986,6 @@
           .then(res => {
             this.messages = _.groupBy(res.data, 'id_conversation')
             this.checkUnreadMessages()
-            console.log('Get new messages!')
           })
           .catch(error => {
             LNbits.utils.notifyApiError(error)
@@ -2005,7 +2003,6 @@
             ]
           }
         }
-        //console.log({chat})
         this.$q.localStorage.set(`lnbits.diagonalley.${this.g.user.id}`, {
           ...data,
           chat
@@ -2031,7 +2028,6 @@
           } else {
             this.$set(this.orders[idx], 'unread', false)
           }
-          console.log('Order:', this.orders[idx])
         }
       },
       clearMessage() {
@@ -2122,6 +2118,11 @@
   })
 </script>
 <style scoped>
+  .q-field__native span{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
   .chat-container {
     position: relative;
     display: grid;
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
index 90b0b7de..7d9e073d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -68,10 +68,11 @@
             dense
             emit-value
             v-model="selectedOrder"
-            :options="Object.keys(user.orders)"
+            :options="Object.keys(user.orders).map(o => ({label: `${o.slice(0, 25)}...`, value: o}))"
             label="Order"
             hint="Select an order from this merchant"
             @input="val => { changeOrder() }"
+            emit-value
           ></q-select>
         </q-form>
       </q-card-section>
@@ -224,7 +225,9 @@
         selectedOrder: null,
         products: [],
         orders: [],
-        user: null,
+        user: {
+          keys: {}
+        },
         keysDialog: {
           show: false,
           data: {}
@@ -291,18 +294,18 @@
             this.user = null
           })
       },
-      async generateKeys() {
-        await LNbits.api
-          .request('GET', '/diagonalley/api/v1/keys', null)
-          .then(response => {
-            if (response.data) {
-              let data = {
-                keys: {
-                  privatekey: response.data.privkey,
-                  publickey: response.data.pubkey
-                }
+      async generateKeys(payment_hash) {
+        return await LNbits.api
+        .request('GET', `/diagonalley/api/v1/keys/${payment_hash}`, null)
+        .then(response => {
+          if (response.data) {
+            let data = {
+              keys: {
+                privatekey: response.data.privkey,
+                publickey: response.data.pubkey
               }
-              this.user = data
+            }
+              this.user.keys = data.keys
               return
             }
           })
@@ -385,37 +388,39 @@
         }
       })
 
-      let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
+      let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`) || false
 
-      try {
-        if (data) {
-          this.user = data
-          //add chat key (merchant pubkey) if not set
-          if (!this.user.orders[`${order_id}`]) {
-            this.$set(this.user.orders, order_id, this.products)
-          }
-        } else {
-          // generate keys
-          await this.generateKeys()
-          // populate user data
-          this.user.orders = {
-            [`${order_id}`]: this.products
-          }
+      if (data) {
+        this.user = data
+        //add chat key (merchant pubkey) if not set
+        if (!this.user.orders[`${order_id}`]) {
+          this.$set(this.user.orders, order_id, this.products)
+        }
+      } else {
+        // generate keys
+        this.generateKeys(order_id)
+        // populate user data
+        this.user.orders = {
+          [`${order_id}`]: this.products
         }
-
-        this.selectedOrder = order_id
-
-        await this.getMessages(order_id)
-
-        this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
-        this.startChat(order_id)
-      } catch (e) {
-        console.error(e)
       }
+
+      this.selectedOrder = order_id
+
+      await this.getMessages(order_id)
+
+      this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
+      this.startChat(order_id)
     }
   })
 </script>
 <style scoped>
+  .q-field__native span{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
   .chat-container {
     position: relative;
     display: grid;
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 1299f694..088eaa34 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -357,7 +357,6 @@
         this.cartMenu = Array.from(this.cart.products, item => {
           return {id: item[0], ...item[1]}
         })
-        console.log(this.cartMenu, this.cart)
       },
       getPubkey() {
         let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
@@ -446,7 +445,6 @@
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = JSON.parse('{{ products | tojson }}')
 
-      console.log(this.stall, this.products)
     }
   })
 </script>
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index e6a4c2de..889b214f 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -55,6 +55,7 @@ from .crud import (
     update_diagonalley_product,
     update_diagonalley_stall,
     update_diagonalley_zone,
+    set_diagonalley_order_pubkey,
 )
 from .models import (
     CreateMarket,
@@ -202,7 +203,6 @@ async def api_diagonalley_stall_create(
 
     if stall_id:
         stall = await get_diagonalley_stall(stall_id)
-        print("ID", stall_id)
         if not stall:
             return {"message": "Withdraw stall does not exist."}
 
@@ -306,7 +306,7 @@ async def api_diagonalley_check_payment(payment_hash: str):
 
 @diagonalley_ext.delete("/api/v1/orders/{order_id}")
 async def api_diagonalley_order_delete(
-    order_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
+    order_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     order = await get_diagonalley_order(order_id)
 
@@ -364,7 +364,6 @@ async def api_diagonalley_stall_products(
     rows = await db.fetchone(
         "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
     )
-    print(rows[1])
     if not rows:
         return {"message": "Stall does not exist."}
 
@@ -393,44 +392,44 @@ async def api_diagonalley_stall_checkshipped(
 ###Place order
 
 
-@diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
-async def api_diagonalley_stall_order(
-    stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
-):
-    product = await get_diagonalley_product(data.productid)
-    shipping = await get_diagonalley_stall(stall_id)
+# @diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
+# async def api_diagonalley_stall_order(
+#     stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
+# ):
+#     product = await get_diagonalley_product(data.productid)
+#     shipping = await get_diagonalley_stall(stall_id)
 
-    if data.shippingzone == 1:
-        shippingcost = shipping.zone1cost  # missing in model
-    else:
-        shippingcost = shipping.zone2cost  # missing in model
+#     if data.shippingzone == 1:
+#         shippingcost = shipping.zone1cost  # missing in model
+#     else:
+#         shippingcost = shipping.zone2cost  # missing in model
 
-    checking_id, payment_request = await create_invoice(
-        wallet_id=product.wallet,
-        amount=shippingcost + (data.quantity * product.price),
-        memo=shipping.wallet,
-    )
-    selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
-    await db.execute(
-        """
-            INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            """,
-        (
-            selling_id,
-            data.productid,
-            product.wallet,  # doesn't exist in model
-            product.product,
-            data.quantity,
-            data.shippingzone,
-            data.address,
-            data.email,
-            checking_id,
-            False,
-            False,
-        ),
-    )
-    return {"checking_id": checking_id, "payment_request": payment_request}
+#     checking_id, payment_request = await create_invoice(
+#         wallet_id=product.wallet,
+#         amount=shippingcost + (data.quantity * product.price),
+#         memo=shipping.wallet,
+#     )
+#     selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
+#     await db.execute(
+#         """
+#             INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
+#             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+#             """,
+#         (
+#             selling_id,
+#             data.productid,
+#             product.wallet,  # doesn't exist in model
+#             product.product,
+#             data.quantity,
+#             data.shippingzone,
+#             data.address,
+#             data.email,
+#             checking_id,
+#             False,
+#             False,
+#         ),
+#     )
+#     return {"checking_id": checking_id, "payment_request": payment_request}
 
 
 ##
@@ -482,13 +481,16 @@ async def api_diagonalley_stall_create(
 ## KEYS
 
 
-@diagonalley_ext.get("/api/v1/keys")
-async def api_diagonalley_generate_keys():
+@diagonalley_ext.get("/api/v1/keys/{payment_hash}")
+async def api_diagonalley_generate_keys(payment_hash: str):
     private_key = PrivateKey()
     public_key = private_key.pubkey.serialize().hex()
     while not public_key.startswith("02"):
         private_key = PrivateKey()
         public_key = private_key.pubkey.serialize().hex()
+
+    # set pubkey in order
+    await set_diagonalley_order_pubkey(payment_hash, pubkey=public_key[2:])
     return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}
 
 

From d5e15518398a960f45ae7f39fcaaef6a567bb227 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 11 Nov 2022 12:12:31 +0000
Subject: [PATCH 112/174] format

---
 .../templates/diagonalley/index.html          |  2 +-
 .../templates/diagonalley/order.html          | 21 ++++++++++---------
 .../templates/diagonalley/stall.html          |  1 -
 lnbits/extensions/diagonalley/views_api.py    |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 5c9b26cc..c18e165d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -2118,7 +2118,7 @@
   })
 </script>
 <style scoped>
-  .q-field__native span{
+  .q-field__native span {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
index 7d9e073d..e8dc0e5a 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -296,15 +296,15 @@
       },
       async generateKeys(payment_hash) {
         return await LNbits.api
-        .request('GET', `/diagonalley/api/v1/keys/${payment_hash}`, null)
-        .then(response => {
-          if (response.data) {
-            let data = {
-              keys: {
-                privatekey: response.data.privkey,
-                publickey: response.data.pubkey
+          .request('GET', `/diagonalley/api/v1/keys/${payment_hash}`, null)
+          .then(response => {
+            if (response.data) {
+              let data = {
+                keys: {
+                  privatekey: response.data.privkey,
+                  publickey: response.data.pubkey
+                }
               }
-            }
               this.user.keys = data.keys
               return
             }
@@ -388,7 +388,8 @@
         }
       })
 
-      let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`) || false
+      let data =
+        this.$q.localStorage.getItem(`lnbits.diagonalley.data`) || false
 
       if (data) {
         this.user = data
@@ -415,7 +416,7 @@
   })
 </script>
 <style scoped>
-  .q-field__native span{
+  .q-field__native span {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index 088eaa34..e758a7bb 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -444,7 +444,6 @@
     created() {
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = JSON.parse('{{ products | tojson }}')
-
     }
   })
 </script>
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 889b214f..e2bd9ab3 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -51,11 +51,11 @@ from .crud import (
     get_diagonalley_stalls_by_ids,
     get_diagonalley_zone,
     get_diagonalley_zones,
+    set_diagonalley_order_pubkey,
     update_diagonalley_market,
     update_diagonalley_product,
     update_diagonalley_stall,
     update_diagonalley_zone,
-    set_diagonalley_order_pubkey,
 )
 from .models import (
     CreateMarket,

From 7e24e129f60676d32bb60d3d62a3006e5e5599f1 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 15 Nov 2022 00:59:41 +0000
Subject: [PATCH 113/174] fix create index error on sqlite

---
 lnbits/extensions/diagonalley/migrations.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 74abcba7..f877e770 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -133,12 +133,13 @@ async def m002_add_chat_messages(db):
     """
     )
 
-    """
-    Create indexes for message fetching 
-    """
-    await db.execute(
-        "CREATE INDEX idx_messages_timestamp ON diagonalley.messages (timestamp DESC)"
-    )
-    await db.execute(
-        "CREATE INDEX idx_messages_conversations ON diagonalley.messages (id_conversation)"
-    )
+    if db.type != "SQLITE":
+        """
+        Create indexes for message fetching
+        """
+        await db.execute(
+            "CREATE INDEX idx_messages_timestamp ON diagonalley.messages (timestamp DESC)"
+        )
+        await db.execute(
+            "CREATE INDEX idx_messages_conversations ON diagonalley.messages (id_conversation)"
+        )

From e725ae097d6642954ea721846718a3ef5781664a Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 24 Nov 2022 14:42:04 +0000
Subject: [PATCH 114/174] display and backup keys for merchant

---
 .../templates/diagonalley/index.html          | 85 ++++++++++++++++---
 1 file changed, 71 insertions(+), 14 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index c18e165d..199a84e7 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -252,19 +252,6 @@
           label="Wallet *"
         >
         </q-select>
-        <!-- NOSTR -->
-        <div class="row">
-          <div class="col-5">
-            <q-btn unelevated @click="generateKeys" color="primary"
-              >Generate keys</q-btn
-            >
-          </div>
-          <div class="col-5">
-            <q-btn unelevated @click="restoreKeys" color="primary"
-              >Restore keys</q-btn
-            >
-          </div>
-        </div>
         <q-input
           v-if="keys"
           filled
@@ -279,6 +266,19 @@
           v-model.trim="stallDialog.data.privatekey"
           label="Private Key"
         ></q-input>
+        <!-- NOSTR -->
+        <div class="row">
+          <div class="col-5">
+            <q-btn unelevated @click="generateKeys" color="primary"
+              >Generate keys</q-btn
+            >
+          </div>
+          <div class="col-5">
+            <q-btn unelevated @click="restoreKeys" color="primary"
+              >Restore keys</q-btn
+            >
+          </div>
+        </div>
         <q-select
           :options="zoneOptions"
           filled
@@ -325,7 +325,9 @@
             unelevated
             color="primary"
             :disable="stallDialog.data.wallet == null
-              || stallDialog.data.shippingzones == null"
+              || stallDialog.data.shippingzones == null
+              || stallDialog.data.publickey == null
+              || stallDialog.data.privatekey == null"
             type="submit"
             >Create Stall</q-btn
           >
@@ -834,6 +836,44 @@
         </q-table>
       </q-card-section>
     </q-card>
+    <!-- KEYS -->
+    <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">Keys</h5>
+          </div>
+          <div class="col-auto">
+            <q-btn flat color="grey" @click="exportKeysCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+      </q-card-section>
+      <q-card-section>
+        <div v-if="keys" class="row">
+          <div
+            class="col-6"
+            v-for="type in ['pubkey', 'privkey']"
+            v-bind:key="type"
+          >
+            <div class="text-center q-mb-lg">
+              {% raw %}
+              <q-responsive :ratio="1" class="q-mx-xl" @click="copyText(keys[type])">
+                <qrcode
+                  :value="keys[type]"
+                  :options="{width: 250}"
+                  class="rounded-borders"
+                ></qrcode>
+                <q-tooltip>{{ keys[type] }}</q-tooltip>
+              </q-responsive>
+              <p>{{ type == 'pubkey' ? 'Public Key' : 'Private Key' }}<br /><small>Click to copy</small></p>
+              {% endraw %}
+            </div>
+          </div>
+        </div>
+      </q-card-section>
+    </q-card>
   </div>
 
   <div class="col-12 col-md-4 col-lg-5 q-gutter-y-md">
@@ -1370,6 +1410,23 @@
           })
         }
       },
+      exportKeysCSV: function () {
+        let colls = [
+        {
+          name: 'privatekey',
+          align: 'left',
+          label: 'Private Key',
+          field: 'privkey'
+        },
+        {
+          name: 'publickey',
+          align: 'left',
+          label: 'Public Key',
+          field: 'pubkey'
+        },
+        ]
+        LNbits.utils.exportCSV(colls, [this.keys])
+      },
       capitalizeFirstLetter: function (string) {
         return string.charAt(0).toUpperCase() + string.slice(1)
       },

From 78e94df9c528bde4f92ba7d94100e6546da932b3 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 25 Nov 2022 14:20:01 +0000
Subject: [PATCH 115/174] export order page URL

---
 .../templates/diagonalley/order.html          | 113 +++++++++++++-----
 lnbits/extensions/diagonalley/views.py        |   4 +-
 2 files changed, 84 insertions(+), 33 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
index e8dc0e5a..a9f74a5d 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -101,38 +101,39 @@
       </q-card-section>
       <q-card-section>
         <q-separator></q-separator>
-        <p>
-          Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
-          quasi.
-        </p>
-        <div v-if="user?.keys" class="row">
-          <div
-            class="col-6"
-            v-for="type in ['publickey', 'privatekey']"
-            v-bind:key="type"
-          >
-            <div class="text-center q-mb-lg">
-              {% raw %}
-              <q-responsive :ratio="1" class="q-mx-xl">
-                <qrcode
-                  :value="user.keys[type]"
-                  :options="{width: 250}"
-                  class="rounded-borders"
-                ></qrcode>
-                <q-tooltip>{{ user.keys[type] }}</q-tooltip>
-              </q-responsive>
-              <p>{{ type == 'publickey' ? 'Public Key' : 'Private Key' }}</p>
-              {% endraw %}
+        <q-list>
+          <q-expansion-item
+            group="extras"
+            icon="vpn_key"
+            label="Keys"
+            ><p>
+              Bellow are the keys needed to contact the merchant. They are
+              stored in the browser!
+            </p>
+            <div v-if="user?.keys" class="row q-col-gutter-md">
+              <div
+                class="col-12 col-sm-6"
+                v-for="type in ['publickey', 'privatekey']"
+                v-bind:key="type"
+              >
+                <div class="text-center q-mb-lg">
+                  {% raw %}
+                  <q-responsive :ratio="1" class="q-mx-auto" style="max-width: 250px;">
+                    <qrcode
+                      :value="user.keys[type]"
+                      :options="{width: 500}"
+                      class="rounded-borders"
+                    ></qrcode>
+                    <q-tooltip>{{ user.keys[type] }}</q-tooltip>
+                  </q-responsive>
+                  <p>
+                    {{ type == 'publickey' ? 'Public Key' : 'Private Key' }}
+                  </p>
+                  {% endraw %}
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
-        <p>
-          Lorem ipsum dolor, sit amet consectetur adipisicing elit. Dolore,
-          quasi.
-        </p>
-      </q-card-section>
-      <q-card-section>
-        <q-separator></q-separator>
+            <q-separator></q-separator>
         <div class="row q-mt-lg">
           <q-btn outline color="grey" @click="downloadKeys"
             >Backup keys
@@ -157,6 +158,38 @@
             <q-tooltip>Delete all data from browser</q-tooltip>
           </q-btn>
         </div>
+            </q-expansion-item
+          >
+        </q-list>
+        <q-expansion-item
+            icon="qr_code"
+            label="Export page"
+            >
+            <p>
+              Export, or send, this page to another device
+            </p>
+            <div class="text-center q-mb-lg">
+              <q-responsive :ratio="1" class="q-my-xl q-mx-auto" style="max-width: 250px;" @click="copyText(exportURL)">
+                <qrcode
+                :value="exportURL"
+                :options="{width: 500}"
+                class="rounded-borders"
+                ></qrcode>
+                <q-tooltip>Click to copy</q-tooltip>
+              </q-responsive>
+            </div>
+            <div class="row q-mt-lg">
+              <q-btn
+                @click="copyText(exportURL)"
+                v-close-popup
+                flat
+                color="grey"
+                class="q-ml-auto"
+                >Copy URL
+                <q-tooltip>Export, or send, this page to another device</q-tooltip>
+              </q-btn>
+            </div>
+          </q-expansion-item>
       </q-card-section>
     </q-card>
   </div>
@@ -234,7 +267,11 @@
         }
       }
     },
-    computed: {},
+    computed: {
+      exportURL(){
+        return '{{request.url}}' + `&keys=${this.user.keys.publickey},${this.user.keys.privatekey}`
+      }
+    },
     methods: {
       clearMessage() {
         this.newMessage = ''
@@ -295,6 +332,9 @@
           })
       },
       async generateKeys(payment_hash) {
+        //check if the keys are set
+        if("publickey" in this.user.keys && "privatekey" in this.user.keys) return
+        
         return await LNbits.api
           .request('GET', `/diagonalley/api/v1/keys/${payment_hash}`, null)
           .then(response => {
@@ -373,10 +413,19 @@
       }
     },
     async created() {
+      console.log('{{request.url}}')
       let order_details = JSON.parse('{{ order | tojson }}')
       let products = JSON.parse('{{ products | tojson }}')
       let order_id = '{{ order_id }}'
+      let hasKeys = Boolean(JSON.parse('{{ publickey | tojson }}') && JSON.parse('{{ privatekey | tojson }}'))
 
+      if(hasKeys) {
+        this.user.keys = {
+          privatekey: '{{ privatekey }}',
+          publickey: '{{ publickey }}'
+        }
+      }
+      
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = order_details.map(o => {
         let product = products.find(p => p.id == o.product_id)
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 2bf98211..63a6c18c 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -95,7 +95,7 @@ async def display(request: Request, market_id):
 
 @diagonalley_ext.get("/order", response_class=HTMLResponse)
 async def chat_page(
-    request: Request, merch: str = Query(...), invoice_id: str = Query(...)
+    request: Request, merch: str = Query(...), invoice_id: str = Query(...), keys: str = Query(None)
 ):
     stall = await get_diagonalley_stall(merch)
     order = await get_diagonalley_order_invoiceid(invoice_id)
@@ -112,6 +112,8 @@ async def chat_page(
                 "publickey": stall.publickey,
                 "wallet": stall.wallet,
             },
+            "publickey": keys.split(',')[0] if keys else None,
+            "privatekey": keys.split(',')[1] if keys else None,
             "order_id": order.invoiceid,
             "order": [details.dict() for details in _order],
             "products": [product.dict() for product in products],

From e9109b0b4952ca22513e7c6866d135ef233d87e2 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 25 Nov 2022 14:24:17 +0000
Subject: [PATCH 116/174] make format

---
 .../templates/diagonalley/index.html          |  36 +++--
 .../templates/diagonalley/order.html          | 127 ++++++++++--------
 lnbits/extensions/diagonalley/views.py        |   9 +-
 3 files changed, 96 insertions(+), 76 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 199a84e7..0e257d12 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -859,7 +859,11 @@
           >
             <div class="text-center q-mb-lg">
               {% raw %}
-              <q-responsive :ratio="1" class="q-mx-xl" @click="copyText(keys[type])">
+              <q-responsive
+                :ratio="1"
+                class="q-mx-xl"
+                @click="copyText(keys[type])"
+              >
                 <qrcode
                   :value="keys[type]"
                   :options="{width: 250}"
@@ -867,7 +871,11 @@
                 ></qrcode>
                 <q-tooltip>{{ keys[type] }}</q-tooltip>
               </q-responsive>
-              <p>{{ type == 'pubkey' ? 'Public Key' : 'Private Key' }}<br /><small>Click to copy</small></p>
+              <p>
+                {{ type == 'pubkey' ? 'Public Key' : 'Private Key' }}<br /><small
+                  >Click to copy</small
+                >
+              </p>
               {% endraw %}
             </div>
           </div>
@@ -1412,18 +1420,18 @@
       },
       exportKeysCSV: function () {
         let colls = [
-        {
-          name: 'privatekey',
-          align: 'left',
-          label: 'Private Key',
-          field: 'privkey'
-        },
-        {
-          name: 'publickey',
-          align: 'left',
-          label: 'Public Key',
-          field: 'pubkey'
-        },
+          {
+            name: 'privatekey',
+            align: 'left',
+            label: 'Private Key',
+            field: 'privkey'
+          },
+          {
+            name: 'publickey',
+            align: 'left',
+            label: 'Public Key',
+            field: 'pubkey'
+          }
         ]
         LNbits.utils.exportCSV(colls, [this.keys])
       },
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
index a9f74a5d..62fb642a 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -102,10 +102,7 @@
       <q-card-section>
         <q-separator></q-separator>
         <q-list>
-          <q-expansion-item
-            group="extras"
-            icon="vpn_key"
-            label="Keys"
+          <q-expansion-item group="extras" icon="vpn_key" label="Keys"
             ><p>
               Bellow are the keys needed to contact the merchant. They are
               stored in the browser!
@@ -118,7 +115,11 @@
               >
                 <div class="text-center q-mb-lg">
                   {% raw %}
-                  <q-responsive :ratio="1" class="q-mx-auto" style="max-width: 250px;">
+                  <q-responsive
+                    :ratio="1"
+                    class="q-mx-auto"
+                    style="max-width: 250px"
+                  >
                     <qrcode
                       :value="user.keys[type]"
                       :options="{width: 500}"
@@ -134,62 +135,63 @@
               </div>
             </div>
             <q-separator></q-separator>
-        <div class="row q-mt-lg">
-          <q-btn outline color="grey" @click="downloadKeys"
-            >Backup keys
-            <q-tooltip>Download your keys</q-tooltip>
-          </q-btn>
-          <q-btn
-            outline
-            color="grey"
-            class="q-mx-sm"
-            @click="keysDialog.show = true"
-            :disabled="this.user.keys"
-            >Restore keys
-            <q-tooltip>Restore keys</q-tooltip>
-          </q-btn>
-          <q-btn
-            @click="deleteData"
-            v-close-popup
-            flat
-            color="grey"
-            class="q-ml-auto"
-            >Delete data
-            <q-tooltip>Delete all data from browser</q-tooltip>
-          </q-btn>
-        </div>
-            </q-expansion-item
-          >
-        </q-list>
-        <q-expansion-item
-            icon="qr_code"
-            label="Export page"
-            >
-            <p>
-              Export, or send, this page to another device
-            </p>
-            <div class="text-center q-mb-lg">
-              <q-responsive :ratio="1" class="q-my-xl q-mx-auto" style="max-width: 250px;" @click="copyText(exportURL)">
-                <qrcode
-                :value="exportURL"
-                :options="{width: 500}"
-                class="rounded-borders"
-                ></qrcode>
-                <q-tooltip>Click to copy</q-tooltip>
-              </q-responsive>
-            </div>
             <div class="row q-mt-lg">
+              <q-btn outline color="grey" @click="downloadKeys"
+                >Backup keys
+                <q-tooltip>Download your keys</q-tooltip>
+              </q-btn>
               <q-btn
-                @click="copyText(exportURL)"
+                outline
+                color="grey"
+                class="q-mx-sm"
+                @click="keysDialog.show = true"
+                :disabled="this.user.keys"
+                >Restore keys
+                <q-tooltip>Restore keys</q-tooltip>
+              </q-btn>
+              <q-btn
+                @click="deleteData"
                 v-close-popup
                 flat
                 color="grey"
                 class="q-ml-auto"
-                >Copy URL
-                <q-tooltip>Export, or send, this page to another device</q-tooltip>
+                >Delete data
+                <q-tooltip>Delete all data from browser</q-tooltip>
               </q-btn>
             </div>
           </q-expansion-item>
+        </q-list>
+        <q-expansion-item icon="qr_code" label="Export page">
+          <p>Export, or send, this page to another device</p>
+          <div class="text-center q-mb-lg">
+            <q-responsive
+              :ratio="1"
+              class="q-my-xl q-mx-auto"
+              style="max-width: 250px"
+              @click="copyText(exportURL)"
+            >
+              <qrcode
+                :value="exportURL"
+                :options="{width: 500}"
+                class="rounded-borders"
+              ></qrcode>
+              <q-tooltip>Click to copy</q-tooltip>
+            </q-responsive>
+          </div>
+          <div class="row q-mt-lg">
+            <q-btn
+              @click="copyText(exportURL)"
+              v-close-popup
+              flat
+              color="grey"
+              class="q-ml-auto"
+              >Copy URL
+              <q-tooltip
+                >Export, or send, this page to another device</q-tooltip
+              >
+            </q-btn>
+          </div>
+        </q-expansion-item>
       </q-card-section>
     </q-card>
   </div>
@@ -268,8 +270,11 @@
       }
     },
     computed: {
-      exportURL(){
-        return '{{request.url}}' + `&keys=${this.user.keys.publickey},${this.user.keys.privatekey}`
+      exportURL() {
+        return (
+          '{{request.url}}' +
+          `&keys=${this.user.keys.publickey},${this.user.keys.privatekey}`
+        )
       }
     },
     methods: {
@@ -333,8 +338,9 @@
       },
       async generateKeys(payment_hash) {
         //check if the keys are set
-        if("publickey" in this.user.keys && "privatekey" in this.user.keys) return
-        
+        if ('publickey' in this.user.keys && 'privatekey' in this.user.keys)
+          return
+
         return await LNbits.api
           .request('GET', `/diagonalley/api/v1/keys/${payment_hash}`, null)
           .then(response => {
@@ -417,15 +423,18 @@
       let order_details = JSON.parse('{{ order | tojson }}')
       let products = JSON.parse('{{ products | tojson }}')
       let order_id = '{{ order_id }}'
-      let hasKeys = Boolean(JSON.parse('{{ publickey | tojson }}') && JSON.parse('{{ privatekey | tojson }}'))
+      let hasKeys = Boolean(
+        JSON.parse('{{ publickey | tojson }}') &&
+          JSON.parse('{{ privatekey | tojson }}')
+      )
 
-      if(hasKeys) {
+      if (hasKeys) {
         this.user.keys = {
           privatekey: '{{ privatekey }}',
           publickey: '{{ publickey }}'
         }
       }
-      
+
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = order_details.map(o => {
         let product = products.find(p => p.id == o.product_id)
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
index 63a6c18c..b87d1918 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/diagonalley/views.py
@@ -95,7 +95,10 @@ async def display(request: Request, market_id):
 
 @diagonalley_ext.get("/order", response_class=HTMLResponse)
 async def chat_page(
-    request: Request, merch: str = Query(...), invoice_id: str = Query(...), keys: str = Query(None)
+    request: Request,
+    merch: str = Query(...),
+    invoice_id: str = Query(...),
+    keys: str = Query(None),
 ):
     stall = await get_diagonalley_stall(merch)
     order = await get_diagonalley_order_invoiceid(invoice_id)
@@ -112,8 +115,8 @@ async def chat_page(
                 "publickey": stall.publickey,
                 "wallet": stall.wallet,
             },
-            "publickey": keys.split(',')[0] if keys else None,
-            "privatekey": keys.split(',')[1] if keys else None,
+            "publickey": keys.split(",")[0] if keys else None,
+            "privatekey": keys.split(",")[1] if keys else None,
             "order_id": order.invoiceid,
             "order": [details.dict() for details in _order],
             "products": [product.dict() for product in products],

From 610814f0d0135082b6877102cb28544499d71e66 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Sun, 27 Nov 2022 16:50:31 +0000
Subject: [PATCH 117/174] add onboarding tutorial

---
 .../templates/diagonalley/index.html          | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 0e257d12..43efe281 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1027,6 +1027,52 @@
       </q-card-section>
     </q-card> -->
   </div>
+  <q-dialog v-model="onboarding.show">
+    <q-card class="q-pa-lg">
+      <h6 class="q-my-md text-primary">How to use Diagon Alley</h6>
+      <q-stepper v-model="step" color="primary" vertical animated>
+        <q-step
+          :name="1"
+          title="Create a Shipping Zone"
+          icon="settings"
+          :done="step > 1"
+        >
+          Create Shipping Zones you're willing to ship to. You can define
+          different values for different zones.
+          <q-stepper-navigation>
+            <q-btn @click="step = step + 1" color="primary" label="Next" />
+          </q-stepper-navigation>
+        </q-step>
+        <q-step
+          :name="2"
+          title="Create a Stall"
+          icon="create_new_folder"
+          :done="step > 2"
+        >
+          Create a Stall and provide private and public keys to use for
+          communication. If you don't have one, LNbits will create a key pair
+          for you. It will be saved and can be used on other stalls.
+          <q-stepper-navigation>
+            <q-btn @click="step = step + 1" color="primary" label="Next" />
+          </q-stepper-navigation>
+        </q-step>
+
+        <q-step :name="3" title="Create Products" icon="assignment">
+          Create your products, add a small description and an image. Choose to
+          what stall, if you have more than one, it belongs to
+          <q-stepper-navigation>
+            <q-btn @click="onboarding.finish" color="primary" label="Finish" />
+          </q-stepper-navigation>
+          <div>
+            <q-checkbox
+              v-model="onboarding.showAgain"
+              label="Show this again?"
+            />
+          </div>
+        </q-step>
+      </q-stepper>
+    </q-card>
+  </q-dialog>
 </div>
 
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
@@ -1097,6 +1143,18 @@
     mixins: [windowMixin],
     data: function () {
       return {
+        step: 1,
+        onboarding: {
+          show: true,
+          showAgain: false,
+          finish: () => {
+            this.$q.localStorage.set(
+              'lnbits.DAOnboarding',
+              this.onboarding.showAgain
+            )
+            this.onboarding.show = false
+          }
+        },
         keys: null,
         products: [],
         orders: [],
@@ -2163,6 +2221,9 @@
     },
     async created() {
       if (this.g.user.wallets.length) {
+        let showOnboard = this.$q.localStorage.getItem('lnbits.DAOnboarding')
+        this.onboarding.show = showOnboard === true || showOnboard == null
+        this.onboarding.showAgain = showOnboard || false
         this.getStalls()
         this.getProducts()
         this.getZones()

From 8e649501cfafb15215a1036534d910472a4c68f1 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 30 Nov 2022 12:20:58 +0000
Subject: [PATCH 118/174] remove payment_hash from generate keys

---
 .../extensions/diagonalley/templates/diagonalley/order.html | 6 +++---
 lnbits/extensions/diagonalley/views_api.py                  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
index 62fb642a..c8b90926 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/order.html
@@ -336,13 +336,13 @@
             this.user = null
           })
       },
-      async generateKeys(payment_hash) {
+      async generateKeys() {
         //check if the keys are set
         if ('publickey' in this.user.keys && 'privatekey' in this.user.keys)
           return
 
         return await LNbits.api
-          .request('GET', `/diagonalley/api/v1/keys/${payment_hash}`, null)
+          .request('GET', `/diagonalley/api/v1/keys`, null)
           .then(response => {
             if (response.data) {
               let data = {
@@ -457,7 +457,7 @@
         }
       } else {
         // generate keys
-        this.generateKeys(order_id)
+        this.generateKeys()
         // populate user data
         this.user.orders = {
           [`${order_id}`]: this.products
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index e2bd9ab3..c3023ea3 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -481,8 +481,8 @@ async def api_diagonalley_stall_create(
 ## KEYS
 
 
-@diagonalley_ext.get("/api/v1/keys/{payment_hash}")
-async def api_diagonalley_generate_keys(payment_hash: str):
+@diagonalley_ext.get("/api/v1/keys")
+async def api_diagonalley_generate_keys():
     private_key = PrivateKey()
     public_key = private_key.pubkey.serialize().hex()
     while not public_key.startswith("02"):

From 3051971db7a0ce416b5bf15ee0d61fb637a34453 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 30 Nov 2022 12:37:15 +0000
Subject: [PATCH 119/174] add a check if generateKeys gets called from merchant

---
 .../extensions/diagonalley/templates/diagonalley/index.html | 2 +-
 lnbits/extensions/diagonalley/views_api.py                  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 43efe281..dacd5e25 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1443,7 +1443,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/keys',
+            '/diagonalley/api/v1/keys/merchant',
             this.g.user.wallets[0].adminkey
           )
           .then(response => {
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index e2bd9ab3..1d9ca81c 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -489,8 +489,10 @@ async def api_diagonalley_generate_keys(payment_hash: str):
         private_key = PrivateKey()
         public_key = private_key.pubkey.serialize().hex()
 
-    # set pubkey in order
-    await set_diagonalley_order_pubkey(payment_hash, pubkey=public_key[2:])
+    # if the call is made from merchant's side skip adding pubkey to order
+    if(payment_hash != "merchant"):
+        # set pubkey in order
+        await set_diagonalley_order_pubkey(payment_hash, pubkey=public_key[2:])
     return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}
 
 

From 1357b17b643a6bd34fc0dbba6dd09356a091c3f6 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Thu, 15 Dec 2022 23:32:49 +0000
Subject: [PATCH 120/174] keys now working

---
 .../extensions/diagonalley/templates/diagonalley/index.html  | 2 +-
 lnbits/extensions/diagonalley/views_api.py                   | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index dacd5e25..43efe281 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1443,7 +1443,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/keys/merchant',
+            '/diagonalley/api/v1/keys',
             this.g.user.wallets[0].adminkey
           )
           .then(response => {
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index 5408a6a4..b4208847 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -488,11 +488,6 @@ async def api_diagonalley_generate_keys():
     while not public_key.startswith("02"):
         private_key = PrivateKey()
         public_key = private_key.pubkey.serialize().hex()
-
-    # if the call is made from merchant's side skip adding pubkey to order
-    if(payment_hash != "merchant"):
-        # set pubkey in order
-        await set_diagonalley_order_pubkey(payment_hash, pubkey=public_key[2:])
     return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}
 
 

From 731544492efd57bc3a70c77ff24a2ca85331abc7 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Thu, 15 Dec 2022 23:47:31 +0000
Subject: [PATCH 121/174] market link broken

---
 lnbits/extensions/diagonalley/templates/diagonalley/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 43efe281..587391eb 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -744,7 +744,7 @@
                   icon="storefront"
                   :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
                   type="a"
-                  :href="'/diagonalley/' + props.row.id"
+                  :href="'/diagonalley/market/' + props.row.id"
                   target="_blank"
                 ></q-btn>
                 <q-tooltip> Link to pass to stall relay </q-tooltip>

From 105d6b7964b749d9ad19d9432e63d10a3ccf5138 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 19 Dec 2022 15:21:35 +0000
Subject: [PATCH 122/174] rename extension to Shop

---
 lnbits/extensions/diagonalley/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/diagonalley/config.json b/lnbits/extensions/diagonalley/config.json
index 194949d0..90f117dd 100644
--- a/lnbits/extensions/diagonalley/config.json
+++ b/lnbits/extensions/diagonalley/config.json
@@ -1,6 +1,6 @@
 {
-  "name": "Diagon Alley",
-  "short_description": "Nostr shop system",
+  "name": "Shop",
+  "short_description": "Make a webshop on LNbits",
   "icon": "add_shopping_cart",
   "contributors": ["benarc", "talvasconcelos"]
 }

From 8381e32148858e8d8f094d2c3b6c1ec2821db9c1 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 19 Dec 2022 15:29:02 +0000
Subject: [PATCH 123/174] add diagonally mode toggle

---
 .../templates/diagonalley/index.html          | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 587391eb..6d98f297 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -396,6 +396,39 @@
           ></q-btn
         >
       </q-card-section>
+      <q-separator inset></q-separator>
+      <q-card-section>
+        <div class="text-h6">Diagon Alley</div>
+        <div class="text-subtitle2">
+          Step inside the Leaky Cauldron and enter the Diagon Alley. Make this
+          market available on Nostr!
+        </div>
+      </q-card-section>
+
+      <q-card-section>
+        <q-toggle
+          disable
+          v-model="diagonAlley"
+          checked-icon="check"
+          color="green"
+          unchecked-icon="clear"
+          label='"Diagon Alley" mode (Nostr)'
+          @input="toggleDA"
+        >
+          <q-tooltip>Coming soon...</q-tooltip></q-toggle
+        >
+        <q-btn
+          disable
+          class="float-right"
+          unelevated
+          color="primary"
+          @click="shopDataDownload"
+          >Download Data
+          <q-tooltip>
+            Download all data (shops, products, orders, etc...)</q-tooltip
+          ></q-btn
+        >
+      </q-card-section>
     </q-card>
 
     <q-card>
@@ -1156,6 +1189,7 @@
           }
         },
         keys: null,
+        diagonAlley: false,
         products: [],
         orders: [],
         stalls: [],
@@ -1439,6 +1473,32 @@
         this[dialog].show = false
         this[dialog].data = {}
       },
+      toggleDA(value, evt) {
+        this.$q.localStorage.set(`lnbits.DAmode`, value)
+      },
+      shopDataDownload() {
+        const removeClone = obj => {
+          delete obj._data
+          return obj
+        }
+        let data = {
+          orders: this.orders.map(removeClone),
+          stalls: this.stalls.map(removeClone),
+          products: this.products.map(removeClone),
+          keys: this.keys
+        }
+        const file = new File([JSON.stringify(data)], 'backup_data.json', {
+          type: 'text/json'
+        })
+        const link = document.createElement('a')
+        const url = URL.createObjectURL(file)
+
+        link.href = url
+        link.download = file.name
+        link.click()
+
+        window.URL.revokeObjectURL(url)
+      },
       generateKeys() {
         LNbits.api
           .request(
@@ -2224,6 +2284,8 @@
         let showOnboard = this.$q.localStorage.getItem('lnbits.DAOnboarding')
         this.onboarding.show = showOnboard === true || showOnboard == null
         this.onboarding.showAgain = showOnboard || false
+        this.diagonAlley =
+          this.$q.localStorage.getItem('lnbits.DAmode') || false
         this.getStalls()
         this.getProducts()
         this.getZones()

From 2a89743a3dc45fcec456517bd0e0f8cbd6202b2c Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:21:48 +0000
Subject: [PATCH 124/174] Renamed DA to shop

---
 .../{diagonalley => shop}/README.md           |   4 +-
 .../{diagonalley => shop}/__init__.py         |  22 +-
 .../{diagonalley => shop}/config.json         |   0
 .../extensions/{diagonalley => shop}/crud.py  | 164 +++++-----
 .../{diagonalley => shop}/migrations.py       |  20 +-
 .../{diagonalley => shop}/models.py           |   0
 .../{diagonalley => shop}/notifier.py         |   4 +-
 .../static/images/placeholder.png             | Bin
 .../extensions/{diagonalley => shop}/tasks.py |  18 +-
 .../templates/diagonalley/_api_docs.html      |  10 +-
 .../templates/diagonalley/index.html          |  78 ++---
 .../templates/diagonalley/market.html         |   6 +-
 .../templates/diagonalley/order.html          |  18 +-
 .../templates/diagonalley/product.html        |   0
 .../templates/diagonalley/stall.html          |  12 +-
 .../extensions/{diagonalley => shop}/views.py |  72 ++---
 .../{diagonalley => shop}/views_api.py        | 280 +++++++++---------
 17 files changed, 354 insertions(+), 354 deletions(-)
 rename lnbits/extensions/{diagonalley => shop}/README.md (53%)
 rename lnbits/extensions/{diagonalley => shop}/__init__.py (56%)
 rename lnbits/extensions/{diagonalley => shop}/config.json (100%)
 rename lnbits/extensions/{diagonalley => shop}/crud.py (56%)
 rename lnbits/extensions/{diagonalley => shop}/migrations.py (84%)
 rename lnbits/extensions/{diagonalley => shop}/models.py (100%)
 rename lnbits/extensions/{diagonalley => shop}/notifier.py (95%)
 rename lnbits/extensions/{diagonalley => shop}/static/images/placeholder.png (100%)
 rename lnbits/extensions/{diagonalley => shop}/tasks.py (57%)
 rename lnbits/extensions/{diagonalley => shop}/templates/diagonalley/_api_docs.html (92%)
 rename lnbits/extensions/{diagonalley => shop}/templates/diagonalley/index.html (96%)
 rename lnbits/extensions/{diagonalley => shop}/templates/diagonalley/market.html (97%)
 rename lnbits/extensions/{diagonalley => shop}/templates/diagonalley/order.html (95%)
 rename lnbits/extensions/{diagonalley => shop}/templates/diagonalley/product.html (100%)
 rename lnbits/extensions/{diagonalley => shop}/templates/diagonalley/stall.html (95%)
 rename lnbits/extensions/{diagonalley => shop}/views.py (70%)
 rename lnbits/extensions/{diagonalley => shop}/views_api.py (52%)

diff --git a/lnbits/extensions/diagonalley/README.md b/lnbits/extensions/shop/README.md
similarity index 53%
rename from lnbits/extensions/diagonalley/README.md
rename to lnbits/extensions/shop/README.md
index e8035b74..86ac9ed9 100644
--- a/lnbits/extensions/diagonalley/README.md
+++ b/lnbits/extensions/shop/README.md
@@ -1,7 +1,7 @@
-<h1>Diagon Alley</h1>
+<h1>Shop</h1>
 <h2>A movable market stand</h2>
 Make a list of products to sell, point the list to an relay (or many), stack sats.
-Diagon Alley is a movable market stand, for anon transactions. You then give permission for an relay to list those products. Delivery addresses are sent through the Lightning Network.
+Shop is a movable market stand, for anon transactions. You then give permission for an relay to list those products. Delivery addresses are sent through the Lightning Network.
 <img src="https://i.imgur.com/P1tvBSG.png">
 
 <h2>API endpoints</h2>
diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/shop/__init__.py
similarity index 56%
rename from lnbits/extensions/diagonalley/__init__.py
rename to lnbits/extensions/shop/__init__.py
index ec193e3a..8c85d8b6 100644
--- a/lnbits/extensions/diagonalley/__init__.py
+++ b/lnbits/extensions/shop/__init__.py
@@ -7,20 +7,20 @@ from lnbits.db import Database
 from lnbits.helpers import template_renderer
 from lnbits.tasks import catch_everything_and_restart
 
-db = Database("ext_diagonalley")
+db = Database("ext_shop")
 
-diagonalley_ext: APIRouter = APIRouter(prefix="/diagonalley", tags=["diagonalley"])
+shop_ext: APIRouter = APIRouter(prefix="/shop", tags=["shop"])
 
-diagonalley_static_files = [
+shop_static_files = [
     {
-        "path": "/diagonalley/static",
-        "app": StaticFiles(directory="lnbits/extensions/diagonalley/static"),
-        "name": "diagonalley_static",
+        "path": "/shop/static",
+        "app": StaticFiles(directory="lnbits/extensions/shop/static"),
+        "name": "shop_static",
     }
 ]
 
 # if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
-#     @diagonalley_ext.get("/", response_class=HTMLResponse)
+#     @shop_ext.get("/", response_class=HTMLResponse)
 #     async def index(request: Request):
 #         return template_renderer().TemplateResponse(
 #                 "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
@@ -28,9 +28,9 @@ diagonalley_static_files = [
 # else:
 
 
-def diagonalley_renderer():
-    return template_renderer(["lnbits/extensions/diagonalley/templates"])
-    # return template_renderer(["lnbits/extensions/diagonalley/templates"])
+def shop_renderer():
+    return template_renderer(["lnbits/extensions/shop/templates"])
+    # return template_renderer(["lnbits/extensions/shop/templates"])
 
 
 from .tasks import wait_for_paid_invoices
@@ -38,6 +38,6 @@ from .views import *  # noqa
 from .views_api import *  # noqa
 
 
-def diagonalley_start():
+def shop_start():
     loop = asyncio.get_event_loop()
     loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
diff --git a/lnbits/extensions/diagonalley/config.json b/lnbits/extensions/shop/config.json
similarity index 100%
rename from lnbits/extensions/diagonalley/config.json
rename to lnbits/extensions/shop/config.json
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/shop/crud.py
similarity index 56%
rename from lnbits/extensions/diagonalley/crud.py
rename to lnbits/extensions/shop/crud.py
index f9601732..e2e5723a 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -29,11 +29,11 @@ from .models import (
 ###Products
 
 
-async def create_diagonalley_product(data: createProduct) -> Products:
+async def create_shop_product(data: createProduct) -> Products:
     product_id = urlsafe_short_hash()
     await db.execute(
         f"""
-        INSERT INTO diagonalley.products (id, stall, product, categories, description, image, price, quantity)
+        INSERT INTO shop.products (id, stall, product, categories, description, image, price, quantity)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
@@ -47,59 +47,59 @@ async def create_diagonalley_product(data: createProduct) -> Products:
             data.quantity,
         ),
     )
-    product = await get_diagonalley_product(product_id)
+    product = await get_shop_product(product_id)
     assert product, "Newly created product couldn't be retrieved"
     return product
 
 
-async def update_diagonalley_product(product_id: str, **kwargs) -> Optional[Stalls]:
+async def update_shop_product(product_id: str, **kwargs) -> Optional[Stalls]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
 
     await db.execute(
-        f"UPDATE diagonalley.products SET {q} WHERE id = ?",
+        f"UPDATE shop.products SET {q} WHERE id = ?",
         (*kwargs.values(), product_id),
     )
     row = await db.fetchone(
-        "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
+        "SELECT * FROM shop.products WHERE id = ?", (product_id,)
     )
 
     return Products(**row) if row else None
 
 
-async def get_diagonalley_product(product_id: str) -> Optional[Products]:
+async def get_shop_product(product_id: str) -> Optional[Products]:
     row = await db.fetchone(
-        "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
+        "SELECT * FROM shop.products WHERE id = ?", (product_id,)
     )
     return Products(**row) if row else None
 
 
-async def get_diagonalley_products(stall_ids: Union[str, List[str]]) -> List[Products]:
+async def get_shop_products(stall_ids: Union[str, List[str]]) -> List[Products]:
     if isinstance(stall_ids, str):
         stall_ids = [stall_ids]
 
-    # with open_ext_db("diagonalley") as db:
+    # with open_ext_db("shop") as db:
     q = ",".join(["?"] * len(stall_ids))
     rows = await db.fetchall(
         f"""
-        SELECT * FROM diagonalley.products WHERE stall IN ({q})
+        SELECT * FROM shop.products WHERE stall IN ({q})
         """,
         (*stall_ids,),
     )
     return [Products(**row) for row in rows]
 
 
-async def delete_diagonalley_product(product_id: str) -> None:
-    await db.execute("DELETE FROM diagonalley.products WHERE id = ?", (product_id,))
+async def delete_shop_product(product_id: str) -> None:
+    await db.execute("DELETE FROM shop.products WHERE id = ?", (product_id,))
 
 
 ###zones
 
 
-async def create_diagonalley_zone(user, data: createZones) -> Zones:
+async def create_shop_zone(user, data: createZones) -> Zones:
     zone_id = urlsafe_short_hash()
     await db.execute(
         f"""
-        INSERT INTO diagonalley.zones (
+        INSERT INTO shop.zones (
             id,
             "user",
             cost,
@@ -111,45 +111,45 @@ async def create_diagonalley_zone(user, data: createZones) -> Zones:
         (zone_id, user, data.cost, data.countries.lower()),
     )
 
-    zone = await get_diagonalley_zone(zone_id)
+    zone = await get_shop_zone(zone_id)
     assert zone, "Newly created zone couldn't be retrieved"
     return zone
 
 
-async def update_diagonalley_zone(zone_id: str, **kwargs) -> Optional[Zones]:
+async def update_shop_zone(zone_id: str, **kwargs) -> Optional[Zones]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE diagonalley.zones SET {q} WHERE id = ?",
+        f"UPDATE shop.zones SET {q} WHERE id = ?",
         (*kwargs.values(), zone_id),
     )
-    row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
+    row = await db.fetchone("SELECT * FROM shop.zones WHERE id = ?", (zone_id,))
     return Zones(**row) if row else None
 
 
-async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
-    row = await db.fetchone("SELECT * FROM diagonalley.zones WHERE id = ?", (zone_id,))
+async def get_shop_zone(zone_id: str) -> Optional[Zones]:
+    row = await db.fetchone("SELECT * FROM shop.zones WHERE id = ?", (zone_id,))
     return Zones(**row) if row else None
 
 
-async def get_diagonalley_zones(user: str) -> List[Zones]:
+async def get_shop_zones(user: str) -> List[Zones]:
     rows = await db.fetchall(
-        'SELECT * FROM diagonalley.zones WHERE "user" = ?', (user,)
+        'SELECT * FROM shop.zones WHERE "user" = ?', (user,)
     )
     return [Zones(**row) for row in rows]
 
 
-async def delete_diagonalley_zone(zone_id: str) -> None:
-    await db.execute("DELETE FROM diagonalley.zones WHERE id = ?", (zone_id,))
+async def delete_shop_zone(zone_id: str) -> None:
+    await db.execute("DELETE FROM shop.zones WHERE id = ?", (zone_id,))
 
 
 ###Stalls
 
 
-async def create_diagonalley_stall(data: createStalls) -> Stalls:
+async def create_shop_stall(data: createStalls) -> Stalls:
     stall_id = urlsafe_short_hash()
     await db.execute(
         f"""
-        INSERT INTO diagonalley.stalls (
+        INSERT INTO shop.stalls (
             id,
             wallet,
             name,
@@ -171,62 +171,62 @@ async def create_diagonalley_stall(data: createStalls) -> Stalls:
         ),
     )
 
-    stall = await get_diagonalley_stall(stall_id)
+    stall = await get_shop_stall(stall_id)
     assert stall, "Newly created stall couldn't be retrieved"
     return stall
 
 
-async def update_diagonalley_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
+async def update_shop_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE diagonalley.stalls SET {q} WHERE id = ?",
+        f"UPDATE shop.stalls SET {q} WHERE id = ?",
         (*kwargs.values(), stall_id),
     )
     row = await db.fetchone(
-        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+        "SELECT * FROM shop.stalls WHERE id = ?", (stall_id,)
     )
     return Stalls(**row) if row else None
 
 
-async def get_diagonalley_stall(stall_id: str) -> Optional[Stalls]:
+async def get_shop_stall(stall_id: str) -> Optional[Stalls]:
     row = await db.fetchone(
-        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+        "SELECT * FROM shop.stalls WHERE id = ?", (stall_id,)
     )
     return Stalls(**row) if row else None
 
 
-async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
+async def get_shop_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.stalls WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM shop.stalls WHERE wallet IN ({q})", (*wallet_ids,)
     )
     return [Stalls(**row) for row in rows]
 
 
-async def get_diagonalley_stalls_by_ids(
+async def get_shop_stalls_by_ids(
     stall_ids: Union[str, List[str]]
 ) -> List[Stalls]:
     q = ",".join(["?"] * len(stall_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.stalls WHERE id IN ({q})", (*stall_ids,)
+        f"SELECT * FROM shop.stalls WHERE id IN ({q})", (*stall_ids,)
     )
     return [Stalls(**row) for row in rows]
 
 
-async def delete_diagonalley_stall(stall_id: str) -> None:
-    await db.execute("DELETE FROM diagonalley.stalls WHERE id = ?", (stall_id,))
+async def delete_shop_stall(stall_id: str) -> None:
+    await db.execute("DELETE FROM shop.stalls WHERE id = ?", (stall_id,))
 
 
 ###Orders
 
 
-async def create_diagonalley_order(data: createOrder, invoiceid: str) -> Orders:
+async def create_shop_order(data: createOrder, invoiceid: str) -> Orders:
     returning = "" if db.type == SQLITE else "RETURNING ID"
     method = db.execute if db.type == SQLITE else db.fetchone
 
     result = await (method)(
         f"""
-            INSERT INTO diagonalley.orders (wallet, shippingzone, address, email, total, invoiceid, paid, shipped)
+            INSERT INTO shop.orders (wallet, shippingzone, address, email, total, invoiceid, paid, shipped)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?)
             {returning}
             """,
@@ -245,19 +245,19 @@ async def create_diagonalley_order(data: createOrder, invoiceid: str) -> Orders:
         return result._result_proxy.lastrowid
     else:
         return result[0]
-    # link = await get_diagonalley_order(link.id)
+    # link = await get_shop_order(link.id)
     # assert link, "Newly created link couldn't be retrieved"
     # return link
 
 
-async def create_diagonalley_order_details(
+async def create_shop_order_details(
     order_id: str, data: List[createOrderDetails]
 ):
     for item in data:
         item_id = urlsafe_short_hash()
         await db.execute(
             """
-            INSERT INTO diagonalley.order_details (id, order_id, product_id, quantity)
+            INSERT INTO shop.order_details (id, order_id, product_id, quantity)
             VALUES (?, ?, ?, ?)
             """,
             (
@@ -267,36 +267,36 @@ async def create_diagonalley_order_details(
                 item.quantity,
             ),
         )
-    order_details = await get_diagonalley_order_details(order_id)
+    order_details = await get_shop_order_details(order_id)
     return order_details
 
 
-async def get_diagonalley_order_details(order_id: str) -> List[OrderDetail]:
+async def get_shop_order_details(order_id: str) -> List[OrderDetail]:
     rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.order_details WHERE order_id = ?", (order_id,)
+        f"SELECT * FROM shop.order_details WHERE order_id = ?", (order_id,)
     )
 
     return [OrderDetail(**row) for row in rows]
 
 
-async def get_diagonalley_order(order_id: str) -> Optional[Orders]:
+async def get_shop_order(order_id: str) -> Optional[Orders]:
     row = await db.fetchone(
-        "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
+        "SELECT * FROM shop.orders WHERE id = ?", (order_id,)
     )
     return Orders(**row) if row else None
 
 
-async def get_diagonalley_order_invoiceid(invoice_id: str) -> Optional[Orders]:
+async def get_shop_order_invoiceid(invoice_id: str) -> Optional[Orders]:
     row = await db.fetchone(
-        "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (invoice_id,)
+        "SELECT * FROM shop.orders WHERE invoiceid = ?", (invoice_id,)
     )
     return Orders(**row) if row else None
 
 
-async def set_diagonalley_order_paid(payment_hash: str) -> Orders:
+async def set_shop_order_paid(payment_hash: str) -> Orders:
     await db.execute(
         """
-            UPDATE diagonalley.orders
+            UPDATE shop.orders
             SET paid = true
             WHERE invoiceid = ?
             """,
@@ -304,10 +304,10 @@ async def set_diagonalley_order_paid(payment_hash: str) -> Orders:
     )
 
 
-async def set_diagonalley_order_pubkey(payment_hash: str, pubkey: str):
+async def set_shop_order_pubkey(payment_hash: str, pubkey: str):
     await db.execute(
         """
-            UPDATE diagonalley.orders
+            UPDATE shop.orders
             SET pubkey = ?
             WHERE invoiceid = ?
             """,
@@ -318,7 +318,7 @@ async def set_diagonalley_order_pubkey(payment_hash: str, pubkey: str):
     )
 
 
-async def update_diagonalley_product_stock(products):
+async def update_shop_product_stock(products):
 
     q = "\n".join(
         [f"""WHEN id='{p.product_id}' THEN quantity - {p.quantity}""" for p in products]
@@ -327,7 +327,7 @@ async def update_diagonalley_product_stock(products):
 
     await db.execute(
         f"""
-            UPDATE diagonalley.products
+            UPDATE shop.products
             SET quantity=(CASE
                         {q}
                         END)
@@ -337,53 +337,53 @@ async def update_diagonalley_product_stock(products):
     )
 
 
-async def get_diagonalley_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
+async def get_shop_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
     if isinstance(wallet_ids, str):
         wallet_ids = [wallet_ids]
 
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM shop.orders WHERE wallet IN ({q})", (*wallet_ids,)
     )
     #
     return [Orders(**row) for row in rows]
 
 
-async def delete_diagonalley_order(order_id: str) -> None:
-    await db.execute("DELETE FROM diagonalley.orders WHERE id = ?", (order_id,))
+async def delete_shop_order(order_id: str) -> None:
+    await db.execute("DELETE FROM shop.orders WHERE id = ?", (order_id,))
 
 
 ### Market/Marketplace
 
 
-async def get_diagonalley_markets(user: str) -> List[Market]:
-    rows = await db.fetchall("SELECT * FROM diagonalley.markets WHERE usr = ?", (user,))
+async def get_shop_markets(user: str) -> List[Market]:
+    rows = await db.fetchall("SELECT * FROM shop.markets WHERE usr = ?", (user,))
     return [Market(**row) for row in rows]
 
 
-async def get_diagonalley_market(market_id: str) -> Optional[Market]:
+async def get_shop_market(market_id: str) -> Optional[Market]:
     row = await db.fetchone(
-        "SELECT * FROM diagonalley.markets WHERE id = ?", (market_id,)
+        "SELECT * FROM shop.markets WHERE id = ?", (market_id,)
     )
     return Market(**row) if row else None
 
 
-async def get_diagonalley_market_stalls(market_id: str):
+async def get_shop_market_stalls(market_id: str):
     rows = await db.fetchall(
-        "SELECT * FROM diagonalley.market_stalls WHERE marketid = ?", (market_id,)
+        "SELECT * FROM shop.market_stalls WHERE marketid = ?", (market_id,)
     )
 
     ids = [row["stallid"] for row in rows]
 
-    return await get_diagonalley_stalls_by_ids(ids)
+    return await get_shop_stalls_by_ids(ids)
 
 
-async def create_diagonalley_market(data: CreateMarket):
+async def create_shop_market(data: CreateMarket):
     market_id = urlsafe_short_hash()
 
     await db.execute(
         """
-            INSERT INTO diagonalley.markets (id, usr, name)
+            INSERT INTO shop.markets (id, usr, name)
             VALUES (?, ?, ?)
             """,
         (
@@ -392,12 +392,12 @@ async def create_diagonalley_market(data: CreateMarket):
             data.name,
         ),
     )
-    market = await get_diagonalley_market(market_id)
+    market = await get_shop_market(market_id)
     assert market, "Newly created market couldn't be retrieved"
     return market
 
 
-async def create_diagonalley_market_stalls(
+async def create_shop_market_stalls(
     market_id: str, data: List[CreateMarketStalls]
 ):
     for stallid in data:
@@ -405,7 +405,7 @@ async def create_diagonalley_market_stalls(
 
         await db.execute(
             """
-            INSERT INTO diagonalley.market_stalls (id, marketid, stallid)
+            INSERT INTO shop.market_stalls (id, marketid, stallid)
             VALUES (?, ?, ?)
             """,
             (
@@ -414,11 +414,11 @@ async def create_diagonalley_market_stalls(
                 stallid,
             ),
         )
-    market_stalls = await get_diagonalley_market_stalls(market_id)
+    market_stalls = await get_shop_market_stalls(market_id)
     return market_stalls
 
 
-async def update_diagonalley_market(market_id):
+async def update_shop_market(market_id):
     pass
 
 
@@ -428,7 +428,7 @@ async def update_diagonalley_market(market_id):
 async def create_chat_message(data: CreateChatMessage):
     await db.execute(
         """
-            INSERT INTO diagonalley.messages (msg, pubkey, id_conversation)
+            INSERT INTO shop.messages (msg, pubkey, id_conversation)
             VALUES (?, ?, ?)
             """,
         (
@@ -439,29 +439,29 @@ async def create_chat_message(data: CreateChatMessage):
     )
 
 
-async def get_diagonalley_latest_chat_messages(room_name: str):
+async def get_shop_latest_chat_messages(room_name: str):
     rows = await db.fetchall(
-        "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20",
+        "SELECT * FROM shop.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20",
         (room_name,),
     )
 
     return [ChatMessage(**row) for row in rows]
 
 
-async def get_diagonalley_chat_messages(room_name: str):
+async def get_shop_chat_messages(room_name: str):
     rows = await db.fetchall(
-        "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC",
+        "SELECT * FROM shop.messages WHERE id_conversation = ? ORDER BY timestamp DESC",
         (room_name,),
     )
 
     return [ChatMessage(**row) for row in rows]
 
 
-async def get_diagonalley_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
+async def get_shop_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
 
     q = ",".join(["?"] * len(ids))
     rows = await db.fetchall(
-        f"SELECT * FROM diagonalley.messages WHERE id_conversation IN ({q})",
+        f"SELECT * FROM shop.messages WHERE id_conversation IN ({q})",
         (*ids,),
     )
     return [ChatMessage(**row) for row in rows]
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/shop/migrations.py
similarity index 84%
rename from lnbits/extensions/diagonalley/migrations.py
rename to lnbits/extensions/shop/migrations.py
index f877e770..fd89d9df 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/shop/migrations.py
@@ -4,7 +4,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE diagonalley.stalls (
+        CREATE TABLE shop.stalls (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
@@ -22,7 +22,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE diagonalley.products (
+        CREATE TABLE shop.products (
             id TEXT PRIMARY KEY,
             stall TEXT NOT NULL REFERENCES {db.references_schema}stalls (id),
             product TEXT NOT NULL,
@@ -41,7 +41,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE diagonalley.zones (
+        CREATE TABLE shop.zones (
             id TEXT PRIMARY KEY,
             "user" TEXT NOT NULL,
             cost TEXT NOT NULL,
@@ -55,7 +55,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE diagonalley.orders (
+        CREATE TABLE shop.orders (
             id {db.serial_primary_key},
             wallet TEXT NOT NULL,
             username TEXT,
@@ -79,7 +79,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE diagonalley.order_details (
+        CREATE TABLE shop.order_details (
             id TEXT PRIMARY KEY,
             order_id INTEGER NOT NULL REFERENCES {db.references_schema}orders (id),
             product_id TEXT NOT NULL REFERENCES {db.references_schema}products (id),
@@ -93,7 +93,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE diagonalley.markets (
+        CREATE TABLE shop.markets (
             id TEXT PRIMARY KEY,
             usr TEXT NOT NULL,
             name TEXT
@@ -106,7 +106,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE diagonalley.market_stalls (
+        CREATE TABLE shop.market_stalls (
             id TEXT PRIMARY KEY,
             marketid TEXT NOT NULL REFERENCES {db.references_schema}markets (id),
             stallid TEXT NOT NULL REFERENCES {db.references_schema}stalls (id)
@@ -121,7 +121,7 @@ async def m002_add_chat_messages(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE diagonalley.messages (
+        CREATE TABLE shop.messages (
             id {db.serial_primary_key},
             msg TEXT NOT NULL,
             pubkey TEXT NOT NULL,
@@ -138,8 +138,8 @@ async def m002_add_chat_messages(db):
         Create indexes for message fetching
         """
         await db.execute(
-            "CREATE INDEX idx_messages_timestamp ON diagonalley.messages (timestamp DESC)"
+            "CREATE INDEX idx_messages_timestamp ON shop.messages (timestamp DESC)"
         )
         await db.execute(
-            "CREATE INDEX idx_messages_conversations ON diagonalley.messages (id_conversation)"
+            "CREATE INDEX idx_messages_conversations ON shop.messages (id_conversation)"
         )
diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/shop/models.py
similarity index 100%
rename from lnbits/extensions/diagonalley/models.py
rename to lnbits/extensions/shop/models.py
diff --git a/lnbits/extensions/diagonalley/notifier.py b/lnbits/extensions/shop/notifier.py
similarity index 95%
rename from lnbits/extensions/diagonalley/notifier.py
rename to lnbits/extensions/shop/notifier.py
index f99cc4bf..0030001c 100644
--- a/lnbits/extensions/diagonalley/notifier.py
+++ b/lnbits/extensions/shop/notifier.py
@@ -10,8 +10,8 @@ from collections import defaultdict
 from fastapi import WebSocket
 from loguru import logger
 
-from lnbits.extensions.diagonalley.crud import create_chat_message
-from lnbits.extensions.diagonalley.models import CreateChatMessage
+from lnbits.extensions.shop.crud import create_chat_message
+from lnbits.extensions.shop.models import CreateChatMessage
 
 
 class Notifier:
diff --git a/lnbits/extensions/diagonalley/static/images/placeholder.png b/lnbits/extensions/shop/static/images/placeholder.png
similarity index 100%
rename from lnbits/extensions/diagonalley/static/images/placeholder.png
rename to lnbits/extensions/shop/static/images/placeholder.png
diff --git a/lnbits/extensions/diagonalley/tasks.py b/lnbits/extensions/shop/tasks.py
similarity index 57%
rename from lnbits/extensions/diagonalley/tasks.py
rename to lnbits/extensions/shop/tasks.py
index cd9e18a8..0e742466 100644
--- a/lnbits/extensions/diagonalley/tasks.py
+++ b/lnbits/extensions/shop/tasks.py
@@ -6,10 +6,10 @@ from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
 
 from .crud import (
-    get_diagonalley_order_details,
-    get_diagonalley_order_invoiceid,
-    set_diagonalley_order_paid,
-    update_diagonalley_product_stock,
+    get_shop_order_details,
+    get_shop_order_invoiceid,
+    set_shop_order_paid,
+    update_shop_product_stock,
 )
 
 
@@ -23,17 +23,17 @@ async def wait_for_paid_invoices():
 
 
 async def on_invoice_paid(payment: Payment) -> None:
-    if payment.extra.get("tag") != "diagonalley":
+    if payment.extra.get("tag") != "shop":
         return
 
-    order = await get_diagonalley_order_invoiceid(payment.payment_hash)
+    order = await get_shop_order_invoiceid(payment.payment_hash)
     if not order:
         logger.error("this should never happen", payment)
         return
 
     # set order as paid
-    await set_diagonalley_order_paid(payment.payment_hash)
+    await set_shop_order_paid(payment.payment_hash)
 
     # deduct items sold from stock
-    details = await get_diagonalley_order_details(order.id)
-    await update_diagonalley_product_stock(details)
+    details = await get_shop_order_details(order.id)
+    await update_shop_product_stock(details)
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html b/lnbits/extensions/shop/templates/diagonalley/_api_docs.html
similarity index 92%
rename from lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
rename to lnbits/extensions/shop/templates/diagonalley/_api_docs.html
index 5418deba..b0ce1dfe 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
+++ b/lnbits/extensions/shop/templates/diagonalley/_api_docs.html
@@ -7,7 +7,7 @@
   <q-card>
     <q-card-section>
       <h5 class="text-subtitle1 q-my-none">
-        Diagon Alley: Decentralised Market-Stalls
+        Shop: Decentralised Market-Stalls
       </h5>
       <p>Each Stall has its own keys!<br /></p>
 
@@ -25,7 +25,7 @@
       Ratings are managed by the relay. Your stall can be listed in multiple
       relays, even over TOR, if you wish to be anonymous.<br />
       More information on the
-      <a href="https://github.com/lnbits/Diagon-Alley">Diagon Alley Protocol</a
+      <a href="https://github.com/lnbits/Diagon-Alley">Shop Protocol</a
       ><br />
       <small>
         Created by, <a href="https://github.com/benarc">Ben Arc</a></small
@@ -51,7 +51,7 @@
       <q-card-section>
         <code
           ><span class="text-light-blue">GET</span>
-          /diagonalley/api/v1/stall/products/&lt;relay_id&gt;</code
+          /shop/api/v1/stall/products/&lt;relay_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <h5 class="text-caption q-mt-sm q-mb-none">
@@ -76,7 +76,7 @@
       <q-card-section>
         <code
           ><span class="text-light-green">POST</span>
-          /diagonalley/api/v1/stall/order/&lt;relay_id&gt;</code
+          /shop/api/v1/stall/order/&lt;relay_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <code
@@ -112,7 +112,7 @@
       <q-card-section>
         <code
           ><span class="text-light-blue">GET</span>
-          /diagonalley/api/v1/stall/checkshipped/&lt;checking_id&gt;</code
+          /shop/api/v1/stall/checkshipped/&lt;checking_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <h5 class="text-caption q-mt-sm q-mb-none">
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/shop/templates/diagonalley/index.html
similarity index 96%
rename from lnbits/extensions/diagonalley/templates/diagonalley/index.html
rename to lnbits/extensions/shop/templates/diagonalley/index.html
index 6d98f297..209c770c 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/shop/templates/diagonalley/index.html
@@ -398,9 +398,9 @@
       </q-card-section>
       <q-separator inset></q-separator>
       <q-card-section>
-        <div class="text-h6">Diagon Alley</div>
+        <div class="text-h6">Shop</div>
         <div class="text-subtitle2">
-          Step inside the Leaky Cauldron and enter the Diagon Alley. Make this
+          Step inside the Leaky Cauldron and enter the Shop. Make this
           market available on Nostr!
         </div>
       </q-card-section>
@@ -412,7 +412,7 @@
           checked-icon="check"
           color="green"
           unchecked-icon="clear"
-          label='"Diagon Alley" mode (Nostr)'
+          label='"Shop" mode (Nostr)'
           @input="toggleDA"
         >
           <q-tooltip>Coming soon...</q-tooltip></q-toggle
@@ -703,7 +703,7 @@
                   icon="storefront"
                   :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
                   type="a"
-                  :href="'/diagonalley/stalls/' + props.row.id"
+                  :href="'/shop/stalls/' + props.row.id"
                   target="_blank"
                 ></q-btn>
                 <q-tooltip> Stall simple UI shopping cart </q-tooltip>
@@ -777,7 +777,7 @@
                   icon="storefront"
                   :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
                   type="a"
-                  :href="'/diagonalley/market/' + props.row.id"
+                  :href="'/shop/market/' + props.row.id"
                   target="_blank"
                 ></q-btn>
                 <q-tooltip> Link to pass to stall relay </q-tooltip>
@@ -921,12 +921,12 @@
     <q-card>
       <q-card-section>
         <h6 class="text-subtitle1 q-my-none">
-          LNbits Diagon Alley Extension, powered by Nostr
+          LNbits Shop Extension, powered by Nostr
         </h6>
       </q-card-section>
       <q-card-section class="q-pa-none">
         <q-separator></q-separator>
-        <q-list> {% include "diagonalley/_api_docs.html" %} </q-list>
+        <q-list> {% include "shop/_api_docs.html" %} </q-list>
       </q-card-section>
     </q-card>
     <!-- CHAT BOX -->
@@ -1062,7 +1062,7 @@
   </div>
   <q-dialog v-model="onboarding.show">
     <q-card class="q-pa-lg">
-      <h6 class="q-my-md text-primary">How to use Diagon Alley</h6>
+      <h6 class="q-my-md text-primary">How to use Shop</h6>
       <q-stepper v-model="step" color="primary" vertical animated>
         <q-step
           :name="1"
@@ -1155,7 +1155,7 @@
     obj._data = _.clone(obj)
     obj.stores = []
     LNbits.api
-      .request('GET', `/diagonalley/api/v1/markets/${obj.id}/stalls`, null)
+      .request('GET', `/shop/api/v1/markets/${obj.id}/stalls`, null)
       .then(response => {
         if (response.data) {
           obj.stores = response.data.map(s => s.name).toString()
@@ -1503,7 +1503,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/keys',
+            '/shop/api/v1/keys',
             this.g.user.wallets[0].adminkey
           )
           .then(response => {
@@ -1512,7 +1512,7 @@
               this.stallDialog.data.publickey = this.keys.pubkey
               this.stallDialog.data.privatekey = this.keys.privkey
               this.$q.localStorage.set(
-                `lnbits.diagonalley.${this.g.user.id}`,
+                `lnbits.shop.${this.g.user.id}`,
                 this.keys
               )
             }
@@ -1523,7 +1523,7 @@
       },
       restoreKeys() {
         let keys = this.$q.localStorage.getItem(
-          `lnbits.diagonalley.${this.g.user.id}`
+          `lnbits.shop.${this.g.user.id}`
         )
         if (keys) {
           this.keys = keys
@@ -1580,7 +1580,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/stalls?all_wallets=true',
+            '/shop/api/v1/stalls?all_wallets=true',
             self.g.user.wallets[0].adminkey
           )
           .then(function (response) {
@@ -1636,7 +1636,7 @@
         LNbits.api
           .request(
             'PUT',
-            '/diagonalley/api/v1/stalls/' + data.id,
+            '/shop/api/v1/stalls/' + data.id,
             _.findWhere(self.g.user.wallets, {
               id: self.stallDialog.data.wallet
             }).inkey,
@@ -1658,7 +1658,7 @@
         LNbits.api
           .request(
             'POST',
-            '/diagonalley/api/v1/stalls',
+            '/shop/api/v1/stalls',
             _.findWhere(self.g.user.wallets, {
               id: self.stallDialog.data.wallet
             }).inkey,
@@ -1685,7 +1685,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/diagonalley/api/v1/stalls/' + stallId,
+                '/shop/api/v1/stalls/' + stallId,
                 _.findWhere(self.g.user.wallets, {id: stall.wallet}).adminkey
               )
               .then(function (response) {
@@ -1710,7 +1710,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/products?all_stalls=true',
+            '/shop/api/v1/products?all_stalls=true',
             self.g.user.wallets[0].inkey
           )
           .then(function (response) {
@@ -1783,7 +1783,7 @@
         LNbits.api
           .request(
             'PUT',
-            '/diagonalley/api/v1/products/' + data.id,
+            '/shop/api/v1/products/' + data.id,
             _.findWhere(self.g.user.wallets, {
               id: wallet
             }).inkey,
@@ -1809,7 +1809,7 @@
         LNbits.api
           .request(
             'POST',
-            '/diagonalley/api/v1/products',
+            '/shop/api/v1/products',
             _.findWhere(self.g.user.wallets, {id: walletId}).inkey,
             data
           )
@@ -1831,7 +1831,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/diagonalley/api/v1/products/' + productId,
+                '/shop/api/v1/products/' + productId,
                 _.findWhere(this.g.user.wallets, {id: walletId}).adminkey
               )
               .then(() => {
@@ -1856,7 +1856,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/zones',
+            '/shop/api/v1/zones',
             this.g.user.wallets[0].inkey
           )
           .then(function (response) {
@@ -1896,7 +1896,7 @@
         LNbits.api
           .request(
             'POST',
-            '/diagonalley/api/v1/zones/' + data.id,
+            '/shop/api/v1/zones/' + data.id,
             self.g.user.wallets[0].adminkey,
             data
           )
@@ -1918,7 +1918,7 @@
         LNbits.api
           .request(
             'POST',
-            '/diagonalley/api/v1/zones',
+            '/shop/api/v1/zones',
             self.g.user.wallets[0].inkey,
             data
           )
@@ -1942,7 +1942,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/diagonalley/api/v1/zones/' + zoneId,
+                '/shop/api/v1/zones/' + zoneId,
                 self.g.user.wallets[0].adminkey
               )
               .then(function (response) {
@@ -1965,7 +1965,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/markets',
+            '/shop/api/v1/markets',
             this.g.user.wallets[0].inkey
           )
           .then(response => {
@@ -2003,7 +2003,7 @@
         LNbits.api
           .request(
             'PUT',
-            '/diagonalley/api/v1/shops' + data.id,
+            '/shop/api/v1/shops' + data.id,
             _.findWhere(self.g.user.wallets, {
               id: self.marketDialog.data.wallet
             }).inkey,
@@ -2026,7 +2026,7 @@
         LNbits.api
           .request(
             'POST',
-            '/diagonalley/api/v1/markets',
+            '/shop/api/v1/markets',
             this.g.user.wallets[0].inkey,
             data
           )
@@ -2050,7 +2050,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/diagonalley/api/v1/shops/' + shopId,
+                '/shop/api/v1/shops/' + shopId,
                 _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
               )
               .then(function (response) {
@@ -2075,7 +2075,7 @@
         await LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/orders?all_wallets=true',
+            '/shop/api/v1/orders?all_wallets=true',
             this.g.user.wallets[0].inkey
           )
           .then(function (response) {
@@ -2099,7 +2099,7 @@
         LNbits.api
           .request(
             'POST',
-            '/diagonalley/api/v1/orders',
+            '/shop/api/v1/orders',
             _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
               .inkey,
             data
@@ -2123,7 +2123,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/diagonalley/api/v1/orders/' + orderId,
+                '/shop/api/v1/orders/' + orderId,
                 _.findWhere(self.g.user.wallets, {id: order.wallet}).adminkey
               )
               .then(function (response) {
@@ -2140,7 +2140,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/orders/shipped/' + order_id,
+            '/shop/api/v1/orders/shipped/' + order_id,
             this.g.user.wallets[0].inkey
           )
           .then(response => {
@@ -2161,7 +2161,7 @@
         await LNbits.api
           .request(
             'GET',
-            `/diagonalley/api/v1/chat/messages/merchant?orders=${this.orders
+            `/shop/api/v1/chat/messages/merchant?orders=${this.orders
               .map(o => o.invoiceid)
               .toString()}`,
             this.g.user.wallets[0].adminkey
@@ -2176,7 +2176,7 @@
       },
       updateLastSeenMsg(id) {
         let data = this.$q.localStorage.getItem(
-          `lnbits.diagonalley.${this.g.user.id}`
+          `lnbits.shop.${this.g.user.id}`
         )
         let chat = {
           ...data.chat,
@@ -2186,7 +2186,7 @@
             ]
           }
         }
-        this.$q.localStorage.set(`lnbits.diagonalley.${this.g.user.id}`, {
+        this.$q.localStorage.set(`lnbits.shop.${this.g.user.id}`, {
           ...data,
           chat
         })
@@ -2194,7 +2194,7 @@
       },
       checkUnreadMessages() {
         let lastMsgs = this.$q.localStorage.getItem(
-          `lnbits.diagonalley.${this.g.user.id}`
+          `lnbits.shop.${this.g.user.id}`
         ).chat
         for (let key in this.messages) {
           let idx = this.orders.findIndex(f => f.invoiceid == key)
@@ -2253,14 +2253,14 @@
           ws_scheme = 'ws://'
         }
         ws = new WebSocket(
-          ws_scheme + location.host + '/diagonalley/ws/' + room_name
+          ws_scheme + location.host + '/shop/ws/' + room_name
         )
 
         function checkWebSocket(event) {
           if (ws.readyState === WebSocket.CLOSED) {
             console.log('WebSocket CLOSED: Reopening')
             ws = new WebSocket(
-              ws_scheme + location.host + '/diagonalley/ws/' + room_name
+              ws_scheme + location.host + '/shop/ws/' + room_name
             )
           }
         }
@@ -2293,7 +2293,7 @@
         this.getMarkets()
         await this.getAllMessages()
         let keys = this.$q.localStorage.getItem(
-          `lnbits.diagonalley.${this.g.user.id}`
+          `lnbits.shop.${this.g.user.id}`
         )
         if (keys) {
           this.keys = keys
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/market.html b/lnbits/extensions/shop/templates/diagonalley/market.html
similarity index 97%
rename from lnbits/extensions/diagonalley/templates/diagonalley/market.html
rename to lnbits/extensions/shop/templates/diagonalley/market.html
index b1a3ce88..a9585bca 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/market.html
+++ b/lnbits/extensions/shop/templates/diagonalley/market.html
@@ -76,7 +76,7 @@
     <q-card class="card--product">
       {% raw %}
       <q-img
-        :src="item.image ? item.image : '/diagonalley/static/images/placeholder.png'"
+        :src="item.image ? item.image : '/shop/static/images/placeholder.png'"
         alt="Product Image"
         loading="lazy"
         spinner-color="white"
@@ -357,7 +357,7 @@
           })
         }
         LNbits.api
-          .request('POST', '/diagonalley/api/v1/orders', null, data)
+          .request('POST', '/shop/api/v1/orders', null, data)
           .then(res => {
             this.checkoutDialog = {show: false, data: {}}
 
@@ -378,7 +378,7 @@
               LNbits.api
                 .request(
                   'GET',
-                  `/diagonalley/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
+                  `/shop/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
                 )
                 .then(res => {
                   if (res.data.paid) {
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/order.html b/lnbits/extensions/shop/templates/diagonalley/order.html
similarity index 95%
rename from lnbits/extensions/diagonalley/templates/diagonalley/order.html
rename to lnbits/extensions/shop/templates/diagonalley/order.html
index c8b90926..b6a23a23 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/order.html
+++ b/lnbits/extensions/shop/templates/diagonalley/order.html
@@ -320,8 +320,8 @@
       },
       restoreKeys() {
         this.user.keys = this.keysDialog.data
-        let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
-        this.$q.localStorage.set(`lnbits.diagonalley.data`, {
+        let data = this.$q.localStorage.getItem(`lnbits.shop.data`)
+        this.$q.localStorage.set(`lnbits.shop.data`, {
           ...data,
           keys: this.user.keys
         })
@@ -332,7 +332,7 @@
         LNbits.utils
           .confirmDialog('Are you sure you want to delete your stored data?')
           .onOk(() => {
-            this.$q.localStorage.remove('lnbits.diagonalley.data')
+            this.$q.localStorage.remove('lnbits.shop.data')
             this.user = null
           })
       },
@@ -342,7 +342,7 @@
           return
 
         return await LNbits.api
-          .request('GET', `/diagonalley/api/v1/keys`, null)
+          .request('GET', `/shop/api/v1/keys`, null)
           .then(response => {
             if (response.data) {
               let data = {
@@ -363,7 +363,7 @@
         await LNbits.api
           .request(
             'GET',
-            `/diagonalley/api/v1/chat/messages/${room_name}${
+            `/shop/api/v1/chat/messages/${room_name}${
               all ? '?all_messages=true' : ''
             }`
           )
@@ -397,14 +397,14 @@
           ws_scheme = 'ws://'
         }
         ws = new WebSocket(
-          ws_scheme + location.host + '/diagonalley/ws/' + room_name
+          ws_scheme + location.host + '/shop/ws/' + room_name
         )
 
         function checkWebSocket(event) {
           if (ws.readyState === WebSocket.CLOSED) {
             console.log('WebSocket CLOSED: Reopening')
             ws = new WebSocket(
-              ws_scheme + location.host + '/diagonalley/ws/' + room_name
+              ws_scheme + location.host + '/shop/ws/' + room_name
             )
           }
         }
@@ -447,7 +447,7 @@
       })
 
       let data =
-        this.$q.localStorage.getItem(`lnbits.diagonalley.data`) || false
+        this.$q.localStorage.getItem(`lnbits.shop.data`) || false
 
       if (data) {
         this.user = data
@@ -468,7 +468,7 @@
 
       await this.getMessages(order_id)
 
-      this.$q.localStorage.set(`lnbits.diagonalley.data`, this.user)
+      this.$q.localStorage.set(`lnbits.shop.data`, this.user)
       this.startChat(order_id)
     }
   })
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/product.html b/lnbits/extensions/shop/templates/diagonalley/product.html
similarity index 100%
rename from lnbits/extensions/diagonalley/templates/diagonalley/product.html
rename to lnbits/extensions/shop/templates/diagonalley/product.html
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/shop/templates/diagonalley/stall.html
similarity index 95%
rename from lnbits/extensions/diagonalley/templates/diagonalley/stall.html
rename to lnbits/extensions/shop/templates/diagonalley/stall.html
index e758a7bb..df312175 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/shop/templates/diagonalley/stall.html
@@ -76,7 +76,7 @@
     <q-card class="card--product">
       {% raw %}
       <q-img
-        :src="item.image ? item.image : '/diagonalley/static/images/placeholder.png'"
+        :src="item.image ? item.image : '/shop/static/images/placeholder.png'"
         alt="Product Image"
         loading="lazy"
         spinner-color="white"
@@ -359,7 +359,7 @@
         })
       },
       getPubkey() {
-        let data = this.$q.localStorage.getItem(`lnbits.diagonalley.data`)
+        let data = this.$q.localStorage.getItem(`lnbits.shop.data`)
         if (data && data.keys.publickey) {
           this.checkoutDialog.data.pubkey = data.keys.publickey
         } else {
@@ -381,7 +381,7 @@
           })
         }
         LNbits.api
-          .request('POST', '/diagonalley/api/v1/orders', null, data)
+          .request('POST', '/shop/api/v1/orders', null, data)
           .then(res => {
             this.checkoutDialog = {show: false, data: {}}
 
@@ -402,7 +402,7 @@
               LNbits.api
                 .request(
                   'GET',
-                  `/diagonalley/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
+                  `/shop/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
                 )
                 .then(res => {
                   if (res.data.paid) {
@@ -416,7 +416,7 @@
                         {
                           label: 'See Order',
                           handler: () => {
-                            window.location.href = `/diagonalley/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
+                            window.location.href = `/shop/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
                           }
                         }
                       ]
@@ -425,7 +425,7 @@
                     this.resetCart()
                     this.closeQrCodeDialog()
                     setTimeout(() => {
-                      window.location.href = `/diagonalley/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
+                      window.location.href = `/shop/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
                     }, 5000)
                   }
                 })
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/shop/views.py
similarity index 70%
rename from lnbits/extensions/diagonalley/views.py
rename to lnbits/extensions/shop/views.py
index b87d1918..bb36d683 100644
--- a/lnbits/extensions/diagonalley/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -11,40 +11,40 @@ from starlette.responses import HTMLResponse
 
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
-from lnbits.extensions.diagonalley import diagonalley_ext, diagonalley_renderer
-from lnbits.extensions.diagonalley.models import CreateChatMessage
-from lnbits.extensions.diagonalley.notifier import Notifier
+from lnbits.extensions.shop import shop_ext, shop_renderer
+from lnbits.extensions.shop.models import CreateChatMessage
+from lnbits.extensions.shop.notifier import Notifier
 
 from .crud import (
     create_chat_message,
-    get_diagonalley_market,
-    get_diagonalley_market_stalls,
-    get_diagonalley_order_details,
-    get_diagonalley_order_invoiceid,
-    get_diagonalley_products,
-    get_diagonalley_stall,
-    get_diagonalley_zone,
-    get_diagonalley_zones,
-    update_diagonalley_product_stock,
+    get_shop_market,
+    get_shop_market_stalls,
+    get_shop_order_details,
+    get_shop_order_invoiceid,
+    get_shop_products,
+    get_shop_stall,
+    get_shop_zone,
+    get_shop_zones,
+    update_shop_product_stock,
 )
 
 templates = Jinja2Templates(directory="templates")
 
 
-@diagonalley_ext.get("/", response_class=HTMLResponse)
+@shop_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
-    return diagonalley_renderer().TemplateResponse(
-        "diagonalley/index.html", {"request": request, "user": user.dict()}
+    return shop_renderer().TemplateResponse(
+        "shop/index.html", {"request": request, "user": user.dict()}
     )
 
 
-@diagonalley_ext.get("/stalls/{stall_id}", response_class=HTMLResponse)
+@shop_ext.get("/stalls/{stall_id}", response_class=HTMLResponse)
 async def display(request: Request, stall_id):
-    stall = await get_diagonalley_stall(stall_id)
-    products = await get_diagonalley_products(stall_id)
+    stall = await get_shop_stall(stall_id)
+    products = await get_shop_products(stall_id)
     zones = []
     for id in stall.shippingzones.split(","):
-        z = await get_diagonalley_zone(id)
+        z = await get_shop_zone(id)
         z = z.dict()
         zones.append({"label": z["countries"], "cost": z["cost"], "value": z["id"]})
 
@@ -57,8 +57,8 @@ async def display(request: Request, stall_id):
     del stall["privatekey"]
     stall["zones"] = zones
 
-    return diagonalley_renderer().TemplateResponse(
-        "diagonalley/stall.html",
+    return shop_renderer().TemplateResponse(
+        "shop/stall.html",
         {
             "request": request,
             "stall": stall,
@@ -67,23 +67,23 @@ async def display(request: Request, stall_id):
     )
 
 
-@diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
+@shop_ext.get("/market/{market_id}", response_class=HTMLResponse)
 async def display(request: Request, market_id):
-    market = await get_diagonalley_market(market_id)
+    market = await get_shop_market(market_id)
 
     if not market:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Marketplace doesn't exist."
         )
 
-    stalls = await get_diagonalley_market_stalls(market_id)
+    stalls = await get_shop_market_stalls(market_id)
     stalls_ids = [stall.id for stall in stalls]
     products = [
-        product.dict() for product in await get_diagonalley_products(stalls_ids)
+        product.dict() for product in await get_shop_products(stalls_ids)
     ]
 
-    return diagonalley_renderer().TemplateResponse(
-        "diagonalley/market.html",
+    return shop_renderer().TemplateResponse(
+        "shop/market.html",
         {
             "request": request,
             "market": market,
@@ -93,20 +93,20 @@ async def display(request: Request, market_id):
     )
 
 
-@diagonalley_ext.get("/order", response_class=HTMLResponse)
+@shop_ext.get("/order", response_class=HTMLResponse)
 async def chat_page(
     request: Request,
     merch: str = Query(...),
     invoice_id: str = Query(...),
     keys: str = Query(None),
 ):
-    stall = await get_diagonalley_stall(merch)
-    order = await get_diagonalley_order_invoiceid(invoice_id)
-    _order = await get_diagonalley_order_details(order.id)
-    products = await get_diagonalley_products(stall.id)
+    stall = await get_shop_stall(merch)
+    order = await get_shop_order_invoiceid(invoice_id)
+    _order = await get_shop_order_details(order.id)
+    products = await get_shop_products(stall.id)
 
-    return diagonalley_renderer().TemplateResponse(
-        "diagonalley/order.html",
+    return shop_renderer().TemplateResponse(
+        "shop/order.html",
         {
             "request": request,
             "stall": {
@@ -155,7 +155,7 @@ notifier = Notifier()
 # manager = ConnectionManager()
 
 
-# @diagonalley_ext.websocket("/ws/{room_name}")
+# @shop_ext.websocket("/ws/{room_name}")
 # async def websocket_endpoint(websocket: WebSocket, room_name: str):
 #     await manager.connect(websocket, room_name)
 #     try:
@@ -165,7 +165,7 @@ notifier = Notifier()
 #         manager.disconnect(websocket)
 
 
-@diagonalley_ext.websocket("/ws/{room_name}")
+@shop_ext.websocket("/ws/{room_name}")
 async def websocket_endpoint(
     websocket: WebSocket, room_name: str, background_tasks: BackgroundTasks
 ):
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/shop/views_api.py
similarity index 52%
rename from lnbits/extensions/diagonalley/views_api.py
rename to lnbits/extensions/shop/views_api.py
index b4208847..2899d2a0 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -21,41 +21,41 @@ from lnbits.decorators import (
 )
 
 from ...helpers import urlsafe_short_hash
-from . import db, diagonalley_ext
+from . import db, shop_ext
 from .crud import (
-    create_diagonalley_market,
-    create_diagonalley_market_stalls,
-    create_diagonalley_order,
-    create_diagonalley_order_details,
-    create_diagonalley_product,
-    create_diagonalley_stall,
-    create_diagonalley_zone,
-    delete_diagonalley_order,
-    delete_diagonalley_product,
-    delete_diagonalley_stall,
-    delete_diagonalley_zone,
-    get_diagonalley_chat_by_merchant,
-    get_diagonalley_chat_messages,
-    get_diagonalley_latest_chat_messages,
-    get_diagonalley_market,
-    get_diagonalley_market_stalls,
-    get_diagonalley_markets,
-    get_diagonalley_order,
-    get_diagonalley_order_details,
-    get_diagonalley_order_invoiceid,
-    get_diagonalley_orders,
-    get_diagonalley_product,
-    get_diagonalley_products,
-    get_diagonalley_stall,
-    get_diagonalley_stalls,
-    get_diagonalley_stalls_by_ids,
-    get_diagonalley_zone,
-    get_diagonalley_zones,
-    set_diagonalley_order_pubkey,
-    update_diagonalley_market,
-    update_diagonalley_product,
-    update_diagonalley_stall,
-    update_diagonalley_zone,
+    create_shop_market,
+    create_shop_market_stalls,
+    create_shop_order,
+    create_shop_order_details,
+    create_shop_product,
+    create_shop_stall,
+    create_shop_zone,
+    delete_shop_order,
+    delete_shop_product,
+    delete_shop_stall,
+    delete_shop_zone,
+    get_shop_chat_by_merchant,
+    get_shop_chat_messages,
+    get_shop_latest_chat_messages,
+    get_shop_market,
+    get_shop_market_stalls,
+    get_shop_markets,
+    get_shop_order,
+    get_shop_order_details,
+    get_shop_order_invoiceid,
+    get_shop_orders,
+    get_shop_product,
+    get_shop_products,
+    get_shop_stall,
+    get_shop_stalls,
+    get_shop_stalls_by_ids,
+    get_shop_zone,
+    get_shop_zones,
+    set_shop_order_pubkey,
+    update_shop_market,
+    update_shop_product,
+    update_shop_stall,
+    update_shop_zone,
 )
 from .models import (
     CreateMarket,
@@ -73,8 +73,8 @@ from .models import (
 
 
 ### Products
-@diagonalley_ext.get("/api/v1/products")
-async def api_diagonalley_products(
+@shop_ext.get("/api/v1/products")
+async def api_shop_products(
     wallet: WalletTypeInfo = Depends(get_key_type),
     all_stalls: bool = Query(False),
 ):
@@ -83,90 +83,90 @@ async def api_diagonalley_products(
     if all_stalls:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    stalls = [stall.id for stall in await get_diagonalley_stalls(wallet_ids)]
+    stalls = [stall.id for stall in await get_shop_stalls(wallet_ids)]
 
     if not stalls:
         return
 
-    return [product.dict() for product in await get_diagonalley_products(stalls)]
+    return [product.dict() for product in await get_shop_products(stalls)]
 
 
-@diagonalley_ext.post("/api/v1/products")
-@diagonalley_ext.put("/api/v1/products/{product_id}")
-async def api_diagonalley_product_create(
+@shop_ext.post("/api/v1/products")
+@shop_ext.put("/api/v1/products/{product_id}")
+async def api_shop_product_create(
     data: createProduct, product_id=None, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
 
     if product_id:
-        product = await get_diagonalley_product(product_id)
+        product = await get_shop_product(product_id)
         if not product:
             return {"message": "Withdraw product does not exist."}
 
-        stall = await get_diagonalley_stall(stall_id=product.stall)
+        stall = await get_shop_stall(stall_id=product.stall)
         if stall.wallet != wallet.wallet.id:
             return {"message": "Not your withdraw product."}
 
-        product = await update_diagonalley_product(product_id, **data.dict())
+        product = await update_shop_product(product_id, **data.dict())
     else:
-        product = await create_diagonalley_product(data=data)
+        product = await create_shop_product(data=data)
 
     return product.dict()
 
 
-@diagonalley_ext.delete("/api/v1/products/{product_id}")
-async def api_diagonalley_products_delete(
+@shop_ext.delete("/api/v1/products/{product_id}")
+async def api_shop_products_delete(
     product_id, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    product = await get_diagonalley_product(product_id)
+    product = await get_shop_product(product_id)
 
     if not product:
         return {"message": "Product does not exist."}
 
-    stall = await get_diagonalley_stall(product.stall)
+    stall = await get_shop_stall(product.stall)
     if stall.wallet != wallet.wallet.id:
-        return {"message": "Not your Diagon Alley."}
+        return {"message": "Not your Shop."}
 
-    await delete_diagonalley_product(product_id)
+    await delete_shop_product(product_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 # # # Shippingzones
 
 
-@diagonalley_ext.get("/api/v1/zones")
-async def api_diagonalley_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
+@shop_ext.get("/api/v1/zones")
+async def api_shop_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
 
-    return await get_diagonalley_zones(wallet.wallet.user)
+    return await get_shop_zones(wallet.wallet.user)
 
 
-@diagonalley_ext.post("/api/v1/zones")
-async def api_diagonalley_zone_create(
+@shop_ext.post("/api/v1/zones")
+async def api_shop_zone_create(
     data: createZones, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
-    zone = await create_diagonalley_zone(user=wallet.wallet.user, data=data)
+    zone = await create_shop_zone(user=wallet.wallet.user, data=data)
     return zone.dict()
 
 
-@diagonalley_ext.post("/api/v1/zones/{zone_id}")
-async def api_diagonalley_zone_update(
+@shop_ext.post("/api/v1/zones/{zone_id}")
+async def api_shop_zone_update(
     data: createZones,
     zone_id: str,
     wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
-    zone = await get_diagonalley_zone(zone_id)
+    zone = await get_shop_zone(zone_id)
     if not zone:
         return {"message": "Zone does not exist."}
     if zone.user != wallet.wallet.user:
         return {"message": "Not your record."}
-    zone = await update_diagonalley_zone(zone_id, **data.dict())
+    zone = await update_shop_zone(zone_id, **data.dict())
     return zone
 
 
-@diagonalley_ext.delete("/api/v1/zones/{zone_id}")
-async def api_diagonalley_zone_delete(
+@shop_ext.delete("/api/v1/zones/{zone_id}")
+async def api_shop_zone_delete(
     zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    zone = await get_diagonalley_zone(zone_id)
+    zone = await get_shop_zone(zone_id)
 
     if not zone:
         return {"message": "zone does not exist."}
@@ -174,15 +174,15 @@ async def api_diagonalley_zone_delete(
     if zone.user != wallet.wallet.user:
         return {"message": "Not your zone."}
 
-    await delete_diagonalley_zone(zone_id)
+    await delete_shop_zone(zone_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 # # # Stalls
 
 
-@diagonalley_ext.get("/api/v1/stalls")
-async def api_diagonalley_stalls(
+@shop_ext.get("/api/v1/stalls")
+async def api_shop_stalls(
     wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
 ):
     wallet_ids = [wallet.wallet.id]
@@ -190,37 +190,37 @@ async def api_diagonalley_stalls(
     if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return [stall.dict() for stall in await get_diagonalley_stalls(wallet_ids)]
+    return [stall.dict() for stall in await get_shop_stalls(wallet_ids)]
 
 
-@diagonalley_ext.post("/api/v1/stalls")
-@diagonalley_ext.put("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_create(
+@shop_ext.post("/api/v1/stalls")
+@shop_ext.put("/api/v1/stalls/{stall_id}")
+async def api_shop_stall_create(
     data: createStalls,
     stall_id: str = None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
 
     if stall_id:
-        stall = await get_diagonalley_stall(stall_id)
+        stall = await get_shop_stall(stall_id)
         if not stall:
             return {"message": "Withdraw stall does not exist."}
 
         if stall.wallet != wallet.wallet.id:
             return {"message": "Not your withdraw stall."}
 
-        stall = await update_diagonalley_stall(stall_id, **data.dict())
+        stall = await update_shop_stall(stall_id, **data.dict())
     else:
-        stall = await create_diagonalley_stall(data=data)
+        stall = await create_shop_stall(data=data)
 
     return stall.dict()
 
 
-@diagonalley_ext.delete("/api/v1/stalls/{stall_id}")
-async def api_diagonalley_stall_delete(
+@shop_ext.delete("/api/v1/stalls/{stall_id}")
+async def api_shop_stall_delete(
     stall_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    stall = await get_diagonalley_stall(stall_id)
+    stall = await get_shop_stall(stall_id)
 
     if not stall:
         return {"message": "Stall does not exist."}
@@ -228,44 +228,44 @@ async def api_diagonalley_stall_delete(
     if stall.wallet != wallet.wallet.id:
         return {"message": "Not your Stall."}
 
-    await delete_diagonalley_stall(stall_id)
+    await delete_shop_stall(stall_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 ###Orders
 
 
-@diagonalley_ext.get("/api/v1/orders")
-async def api_diagonalley_orders(
+@shop_ext.get("/api/v1/orders")
+async def api_shop_orders(
     wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
 ):
     wallet_ids = [wallet.wallet.id]
     if all_wallets:
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    orders = await get_diagonalley_orders(wallet_ids)
+    orders = await get_shop_orders(wallet_ids)
     orders_with_details = []
     for order in orders:
         order = order.dict()
-        order["details"] = await get_diagonalley_order_details(order["id"])
+        order["details"] = await get_shop_order_details(order["id"])
         orders_with_details.append(order)
     try:
         return orders_with_details  # [order for order in orders]
-        # return [order.dict() for order in await get_diagonalley_orders(wallet_ids)]
+        # return [order.dict() for order in await get_shop_orders(wallet_ids)]
     except:
         return {"message": "We could not retrieve the orders."}
 
 
-@diagonalley_ext.get("/api/v1/orders/{order_id}")
-async def api_diagonalley_order_by_id(order_id: str):
-    order = (await get_diagonalley_order(order_id)).dict()
-    order["details"] = await get_diagonalley_order_details(order_id)
+@shop_ext.get("/api/v1/orders/{order_id}")
+async def api_shop_order_by_id(order_id: str):
+    order = (await get_shop_order(order_id)).dict()
+    order["details"] = await get_shop_order_details(order_id)
 
     return order
 
 
-@diagonalley_ext.post("/api/v1/orders")
-async def api_diagonalley_order_create(data: createOrder):
+@shop_ext.post("/api/v1/orders")
+async def api_shop_order_create(data: createOrder):
     ref = urlsafe_short_hash()
 
     payment_hash, payment_request = await create_invoice(
@@ -273,14 +273,14 @@ async def api_diagonalley_order_create(data: createOrder):
         amount=data.total,
         memo=f"New order on Diagon alley",
         extra={
-            "tag": "diagonalley",
+            "tag": "shop",
             "reference": ref,
         },
     )
-    order_id = await create_diagonalley_order(invoiceid=payment_hash, data=data)
+    order_id = await create_shop_order(invoiceid=payment_hash, data=data)
     logger.debug(f"ORDER ID {order_id}")
     logger.debug(f"PRODUCTS {data.products}")
-    await create_diagonalley_order_details(order_id=order_id, data=data.products)
+    await create_shop_order_details(order_id=order_id, data=data.products)
     return {
         "payment_hash": payment_hash,
         "payment_request": payment_request,
@@ -288,9 +288,9 @@ async def api_diagonalley_order_create(data: createOrder):
     }
 
 
-@diagonalley_ext.get("/api/v1/orders/payments/{payment_hash}")
-async def api_diagonalley_check_payment(payment_hash: str):
-    order = await get_diagonalley_order_invoiceid(payment_hash)
+@shop_ext.get("/api/v1/orders/payments/{payment_hash}")
+async def api_shop_check_payment(payment_hash: str):
+    order = await get_shop_order_invoiceid(payment_hash)
     if not order:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Order does not exist."
@@ -304,11 +304,11 @@ async def api_diagonalley_check_payment(payment_hash: str):
     return status
 
 
-@diagonalley_ext.delete("/api/v1/orders/{order_id}")
-async def api_diagonalley_order_delete(
+@shop_ext.delete("/api/v1/orders/{order_id}")
+async def api_shop_order_delete(
     order_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    order = await get_diagonalley_order(order_id)
+    order = await get_shop_order(order_id)
 
     if not order:
         return {"message": "Order does not exist."}
@@ -316,17 +316,17 @@ async def api_diagonalley_order_delete(
     if order.wallet != wallet.wallet.id:
         return {"message": "Not your Order."}
 
-    await delete_diagonalley_order(order_id)
+    await delete_shop_order(order_id)
 
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
-@diagonalley_ext.get("/api/v1/orders/paid/{order_id}")
-async def api_diagonalley_order_paid(
+@shop_ext.get("/api/v1/orders/paid/{order_id}")
+async def api_shop_order_paid(
     order_id, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     await db.execute(
-        "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
+        "UPDATE shop.orders SET paid = ? WHERE id = ?",
         (
             True,
             order_id,
@@ -335,19 +335,19 @@ async def api_diagonalley_order_paid(
     return "", HTTPStatus.OK
 
 
-@diagonalley_ext.get("/api/v1/orders/shipped/{order_id}")
-async def api_diagonalley_order_shipped(
+@shop_ext.get("/api/v1/orders/shipped/{order_id}")
+async def api_shop_order_shipped(
     order_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     await db.execute(
-        "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
+        "UPDATE shop.orders SET shipped = ? WHERE id = ?",
         (
             True,
             order_id,
         ),
     )
     order = await db.fetchone(
-        "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
+        "SELECT * FROM shop.orders WHERE id = ?", (order_id,)
     )
 
     return order
@@ -356,35 +356,35 @@ async def api_diagonalley_order_shipped(
 ###List products based on stall id
 
 
-@diagonalley_ext.get("/api/v1/stall/products/{stall_id}")
-async def api_diagonalley_stall_products(
+@shop_ext.get("/api/v1/stall/products/{stall_id}")
+async def api_shop_stall_products(
     stall_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
 
     rows = await db.fetchone(
-        "SELECT * FROM diagonalley.stalls WHERE id = ?", (stall_id,)
+        "SELECT * FROM shop.stalls WHERE id = ?", (stall_id,)
     )
     if not rows:
         return {"message": "Stall does not exist."}
 
     products = db.fetchone(
-        "SELECT * FROM diagonalley.products WHERE wallet = ?", (rows[1],)
+        "SELECT * FROM shop.products WHERE wallet = ?", (rows[1],)
     )
     if not products:
         return {"message": "No products"}
 
-    return [products.dict() for products in await get_diagonalley_products(rows[1])]
+    return [products.dict() for products in await get_shop_products(rows[1])]
 
 
 ###Check a product has been shipped
 
 
-@diagonalley_ext.get("/api/v1/stall/checkshipped/{checking_id}")
-async def api_diagonalley_stall_checkshipped(
+@shop_ext.get("/api/v1/stall/checkshipped/{checking_id}")
+async def api_shop_stall_checkshipped(
     checking_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     rows = await db.fetchone(
-        "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
+        "SELECT * FROM shop.orders WHERE invoiceid = ?", (checking_id,)
     )
     return {"shipped": rows["shipped"]}
 
@@ -392,12 +392,12 @@ async def api_diagonalley_stall_checkshipped(
 ###Place order
 
 
-# @diagonalley_ext.post("/api/v1/stall/order/{stall_id}")
-# async def api_diagonalley_stall_order(
+# @shop_ext.post("/api/v1/stall/order/{stall_id}")
+# async def api_shop_stall_order(
 #     stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
 # ):
-#     product = await get_diagonalley_product(data.productid)
-#     shipping = await get_diagonalley_stall(stall_id)
+#     product = await get_shop_product(data.productid)
+#     shipping = await get_shop_stall(stall_id)
 
 #     if data.shippingzone == 1:
 #         shippingcost = shipping.zone1cost  # missing in model
@@ -412,7 +412,7 @@ async def api_diagonalley_stall_checkshipped(
 #     selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
 #     await db.execute(
 #         """
-#             INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
+#             INSERT INTO shop.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
 #             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 #             """,
 #         (
@@ -437,43 +437,43 @@ async def api_diagonalley_stall_checkshipped(
 ##
 
 
-@diagonalley_ext.get("/api/v1/markets")
-async def api_diagonalley_markets(wallet: WalletTypeInfo = Depends(get_key_type)):
-    # await get_diagonalley_market_stalls(market_id="FzpWnMyHQMcRppiGVua4eY")
+@shop_ext.get("/api/v1/markets")
+async def api_shop_markets(wallet: WalletTypeInfo = Depends(get_key_type)):
+    # await get_shop_market_stalls(market_id="FzpWnMyHQMcRppiGVua4eY")
     try:
         return [
             market.dict()
-            for market in await get_diagonalley_markets(wallet.wallet.user)
+            for market in await get_shop_markets(wallet.wallet.user)
         ]
     except:
         return {"message": "We could not retrieve the markets."}
 
 
-@diagonalley_ext.get("/api/v1/markets/{market_id}/stalls")
-async def api_diagonalley_market_stalls(market_id: str):
-    stall_ids = await get_diagonalley_market_stalls(market_id)
+@shop_ext.get("/api/v1/markets/{market_id}/stalls")
+async def api_shop_market_stalls(market_id: str):
+    stall_ids = await get_shop_market_stalls(market_id)
     return stall_ids
 
 
-@diagonalley_ext.post("/api/v1/markets")
-@diagonalley_ext.put("/api/v1/markets/{market_id}")
-async def api_diagonalley_stall_create(
+@shop_ext.post("/api/v1/markets")
+@shop_ext.put("/api/v1/markets/{market_id}")
+async def api_shop_stall_create(
     data: CreateMarket,
     market_id: str = None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
     if market_id:
-        market = await get_diagonalley_market(market_id)
+        market = await get_shop_market(market_id)
         if not market:
             return {"message": "Market does not exist."}
 
         if market.usr != wallet.wallet.user:
             return {"message": "Not your market."}
 
-        market = await update_diagonalley_market(market_id, **data.dict())
+        market = await update_shop_market(market_id, **data.dict())
     else:
-        market = await create_diagonalley_market(data=data)
-        await create_diagonalley_market_stalls(market_id=market.id, data=data.stalls)
+        market = await create_shop_market(data=data)
+        await create_shop_market_stalls(market_id=market.id, data=data.stalls)
 
     return market.dict()
 
@@ -481,8 +481,8 @@ async def api_diagonalley_stall_create(
 ## KEYS
 
 
-@diagonalley_ext.get("/api/v1/keys")
-async def api_diagonalley_generate_keys():
+@shop_ext.get("/api/v1/keys")
+async def api_shop_generate_keys():
     private_key = PrivateKey()
     public_key = private_key.pubkey.serialize().hex()
     while not public_key.startswith("02"):
@@ -494,21 +494,21 @@ async def api_diagonalley_generate_keys():
 ## MESSAGES/CHAT
 
 
-@diagonalley_ext.get("/api/v1/chat/messages/merchant")
+@shop_ext.get("/api/v1/chat/messages/merchant")
 async def api_get_merchant_messages(
     orders: str = Query(...), wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
 
     return [
-        msg.dict() for msg in await get_diagonalley_chat_by_merchant(orders.split(","))
+        msg.dict() for msg in await get_shop_chat_by_merchant(orders.split(","))
     ]
 
 
-@diagonalley_ext.get("/api/v1/chat/messages/{room_name}")
+@shop_ext.get("/api/v1/chat/messages/{room_name}")
 async def api_get_latest_chat_msg(room_name: str, all_messages: bool = Query(False)):
     if all_messages:
-        messages = await get_diagonalley_chat_messages(room_name)
+        messages = await get_shop_chat_messages(room_name)
     else:
-        messages = await get_diagonalley_latest_chat_messages(room_name)
+        messages = await get_shop_latest_chat_messages(room_name)
 
     return messages

From e1cad034a2fd69476950c75e70984ed5807058d3 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:25:42 +0000
Subject: [PATCH 125/174] Fixed toggle, made description more generic

---
 lnbits/extensions/shop/templates/diagonalley/index.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lnbits/extensions/shop/templates/diagonalley/index.html b/lnbits/extensions/shop/templates/diagonalley/index.html
index 209c770c..14bd0709 100644
--- a/lnbits/extensions/shop/templates/diagonalley/index.html
+++ b/lnbits/extensions/shop/templates/diagonalley/index.html
@@ -400,8 +400,7 @@
       <q-card-section>
         <div class="text-h6">Shop</div>
         <div class="text-subtitle2">
-          Step inside the Leaky Cauldron and enter the Shop. Make this
-          market available on Nostr!
+          Make a shop of multiple stalls.
         </div>
       </q-card-section>
 
@@ -412,7 +411,7 @@
           checked-icon="check"
           color="green"
           unchecked-icon="clear"
-          label='"Shop" mode (Nostr)'
+          label='"Diagon Alley" mode (Nostr)'
           @input="toggleDA"
         >
           <q-tooltip>Coming soon...</q-tooltip></q-toggle
@@ -423,9 +422,9 @@
           unelevated
           color="primary"
           @click="shopDataDownload"
-          >Download Data
+          >Export all Data
           <q-tooltip>
-            Download all data (shops, products, orders, etc...)</q-tooltip
+            Export all data (shops, products, orders, etc...)</q-tooltip
           ></q-btn
         >
       </q-card-section>

From fa23eeb0558b681e765c8827f481f3f3bc86d682 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:32:54 +0000
Subject: [PATCH 126/174] improved description

---
 .../shop/templates/diagonalley/_api_docs.html | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/lnbits/extensions/shop/templates/diagonalley/_api_docs.html b/lnbits/extensions/shop/templates/diagonalley/_api_docs.html
index b0ce1dfe..189df2e5 100644
--- a/lnbits/extensions/shop/templates/diagonalley/_api_docs.html
+++ b/lnbits/extensions/shop/templates/diagonalley/_api_docs.html
@@ -7,28 +7,24 @@
   <q-card>
     <q-card-section>
       <h5 class="text-subtitle1 q-my-none">
-        Shop: Decentralised Market-Stalls
+        LNbits Shop (Nostr support coming soon)
       </h5>
-      <p>Each Stall has its own keys!<br /></p>
 
       <ol>
         <li>Create Shipping Zones you're willing to ship to</li>
         <li>Create a Stall to list yiur products on</li>
         <li>Create products to put on the Stall</li>
         <li>
-          List stalls on a simple frontend shop page, or point at Nostr shop
-          client key
+          Take orders
+        </li>
+        <li>
+          Includes chat support!
         </li>
       </ol>
-      Make a list of products to sell, point your list of products at a public
-      relay. Buyers browse your products on the relay, and pay you directly.
-      Ratings are managed by the relay. Your stall can be listed in multiple
-      relays, even over TOR, if you wish to be anonymous.<br />
-      More information on the
-      <a href="https://github.com/lnbits/Diagon-Alley">Shop Protocol</a
-      ><br />
+      The first LNbits shop idea 'Diagon Alley' helped create Nostr, and soon this shop extension will have the option to work on Nostr 'Diagon Alley' mode, by the merchant, shop, and buyer all having keys, and data being routed through Nostr relays.
+      <br />
       <small>
-        Created by, <a href="https://github.com/benarc">Ben Arc</a></small
+        Created by, <a href="https://github.com/talvasconcelos">Tal Vasconcelos</a>,  <a href="https://github.com/benarc">Ben Arc</a></small
       >
       <!-- </p> -->
     </q-card-section>

From 5765c3c8c9b92cb20a1fc1dbdfe20db1fc82ee38 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:35:17 +0000
Subject: [PATCH 127/174] renamed folder

---
 .../shop/templates/{diagonalley => shop}/_api_docs.html           | 0
 lnbits/extensions/shop/templates/{diagonalley => shop}/index.html | 0
 .../extensions/shop/templates/{diagonalley => shop}/market.html   | 0
 lnbits/extensions/shop/templates/{diagonalley => shop}/order.html | 0
 .../extensions/shop/templates/{diagonalley => shop}/product.html  | 0
 lnbits/extensions/shop/templates/{diagonalley => shop}/stall.html | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename lnbits/extensions/shop/templates/{diagonalley => shop}/_api_docs.html (100%)
 rename lnbits/extensions/shop/templates/{diagonalley => shop}/index.html (100%)
 rename lnbits/extensions/shop/templates/{diagonalley => shop}/market.html (100%)
 rename lnbits/extensions/shop/templates/{diagonalley => shop}/order.html (100%)
 rename lnbits/extensions/shop/templates/{diagonalley => shop}/product.html (100%)
 rename lnbits/extensions/shop/templates/{diagonalley => shop}/stall.html (100%)

diff --git a/lnbits/extensions/shop/templates/diagonalley/_api_docs.html b/lnbits/extensions/shop/templates/shop/_api_docs.html
similarity index 100%
rename from lnbits/extensions/shop/templates/diagonalley/_api_docs.html
rename to lnbits/extensions/shop/templates/shop/_api_docs.html
diff --git a/lnbits/extensions/shop/templates/diagonalley/index.html b/lnbits/extensions/shop/templates/shop/index.html
similarity index 100%
rename from lnbits/extensions/shop/templates/diagonalley/index.html
rename to lnbits/extensions/shop/templates/shop/index.html
diff --git a/lnbits/extensions/shop/templates/diagonalley/market.html b/lnbits/extensions/shop/templates/shop/market.html
similarity index 100%
rename from lnbits/extensions/shop/templates/diagonalley/market.html
rename to lnbits/extensions/shop/templates/shop/market.html
diff --git a/lnbits/extensions/shop/templates/diagonalley/order.html b/lnbits/extensions/shop/templates/shop/order.html
similarity index 100%
rename from lnbits/extensions/shop/templates/diagonalley/order.html
rename to lnbits/extensions/shop/templates/shop/order.html
diff --git a/lnbits/extensions/shop/templates/diagonalley/product.html b/lnbits/extensions/shop/templates/shop/product.html
similarity index 100%
rename from lnbits/extensions/shop/templates/diagonalley/product.html
rename to lnbits/extensions/shop/templates/shop/product.html
diff --git a/lnbits/extensions/shop/templates/diagonalley/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
similarity index 100%
rename from lnbits/extensions/shop/templates/diagonalley/stall.html
rename to lnbits/extensions/shop/templates/shop/stall.html

From 1a820b4dac080560228457a37ca28ff9ad1b7194 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:42:11 +0000
Subject: [PATCH 128/174] v-if all diagonalley things

---
 lnbits/extensions/shop/templates/shop/index.html | 15 ++++++++++-----
 lnbits/extensions/shop/templates/shop/order.html |  4 +++-
 lnbits/extensions/shop/templates/shop/stall.html |  2 ++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 14bd0709..26491bf5 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -253,6 +253,7 @@
         >
         </q-select>
         <q-input
+          v-if="diagonalley" 
           v-if="keys"
           filled
           dense
@@ -260,6 +261,8 @@
           label="Public Key"
         ></q-input>
         <q-input
+
+          v-if="diagonalley" 
           v-if="keys"
           filled
           dense
@@ -267,7 +270,7 @@
           label="Private Key"
         ></q-input>
         <!-- NOSTR -->
-        <div class="row">
+        <div v-if="diagonalley" class="row">
           <div class="col-5">
             <q-btn unelevated @click="generateKeys" color="primary"
               >Generate keys</q-btn
@@ -287,8 +290,8 @@
           v-model.trim="stallDialog.data.shippingzones"
           label="Shipping Zones"
         ></q-select>
-        <!-- NOSTR -->
-        <!-- <q-select
+        <q-select
+          v-if="diagonalley" 
           :options="relayOptions"
           filled
           dense
@@ -297,18 +300,19 @@
           label="Relays"
         ></q-select>
         <q-input
+        v-if="diagonalley" 
           filled
           dense
           v-model.trim="stallDialog.data.crelays"
           label="Custom relays (seperate by comma)"
         ></q-input>
-        
         <q-input
+          v-if="diagonalley" 
           filled
           dense
           v-model.trim="stallDialog.data.nostrShops"
           label="Nostr shop public keys (seperate by comma)"
-        ></q-input> -->
+        ></q-input>
         <p>
           <strong><small>Nostr support coming soon!</small></strong>
         </p>
@@ -1189,6 +1193,7 @@
         },
         keys: null,
         diagonAlley: false,
+        diagonalley: false,
         products: [],
         orders: [],
         stalls: [],
diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index b6a23a23..91c7ea38 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -102,7 +102,7 @@
       <q-card-section>
         <q-separator></q-separator>
         <q-list>
-          <q-expansion-item group="extras" icon="vpn_key" label="Keys"
+          <q-expansion-item v-if="diagonalley"  group="extras" icon="vpn_key" label="Keys"
             ><p>
               Bellow are the keys needed to contact the merchant. They are
               stored in the browser!
@@ -197,6 +197,7 @@
   </div>
   <!-- RESTORE KEYS DIALOG -->
   <q-dialog
+  v-if="diagonalley" 
     v-model="keysDialog.show"
     position="top"
     @hide="clearRestoreKeyDialog"
@@ -258,6 +259,7 @@
         messages: {},
         stall: null,
         selectedOrder: null,
+        diagonalley: false,
         products: [],
         orders: [],
         user: {
diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index df312175..5758cb76 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -163,6 +163,7 @@
           label="Name *optional"
         ></q-input>
         <q-input
+          v-if="diagonalley" 
           filled
           dense
           v-model.trim="checkoutDialog.data.pubkey"
@@ -279,6 +280,7 @@
         stall: null,
         products: [],
         searchText: null,
+        diagonalley:false,
         cart: {
           total: 0,
           size: 0,

From 1bf05df4a9a71e7cdb8fd47c7750ea188d980730 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:43:22 +0000
Subject: [PATCH 129/174] removed

---
 lnbits/extensions/shop/templates/shop/index.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 26491bf5..2d3065ab 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -313,9 +313,7 @@
           v-model.trim="stallDialog.data.nostrShops"
           label="Nostr shop public keys (seperate by comma)"
         ></q-input>
-        <p>
-          <strong><small>Nostr support coming soon!</small></strong>
-        </p>
+
         <div class="row q-mt-lg">
           <q-btn
             v-if="stallDialog.data.id"

From 3038b4be868365aa16e424d619a923132b518ce3 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:44:22 +0000
Subject: [PATCH 130/174] removed key need

---
 lnbits/extensions/shop/templates/shop/index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 2d3065ab..7c8e8f60 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -328,8 +328,6 @@
             color="primary"
             :disable="stallDialog.data.wallet == null
               || stallDialog.data.shippingzones == null
-              || stallDialog.data.publickey == null
-              || stallDialog.data.privatekey == null"
             type="submit"
             >Create Stall</q-btn
           >

From 9e03c05bcc1571fe20ffe75774b16ed5f0e918b0 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:44:59 +0000
Subject: [PATCH 131/174] Whoops

---
 lnbits/extensions/shop/templates/shop/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 7c8e8f60..9e3d30dc 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -327,7 +327,7 @@
             unelevated
             color="primary"
             :disable="stallDialog.data.wallet == null
-              || stallDialog.data.shippingzones == null
+              || stallDialog.data.shippingzones == null"
             type="submit"
             >Create Stall</q-btn
           >

From 64bf0c406be955b6978871130a0462ed9db3b698 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:48:42 +0000
Subject: [PATCH 132/174] messages max height

---
 lnbits/extensions/shop/templates/shop/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 9e3d30dc..5ab0529e 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -929,7 +929,7 @@
       </q-card-section>
     </q-card>
     <!-- CHAT BOX -->
-    <q-card>
+    <q-card style="max-height: 800px">
       <q-card-section>
         <h6 class="text-subtitle1 q-my-none">Messages</h6>
       </q-card-section>

From 4d2f9faceeb5d6030e9620ab5776529b1fb1fcb9 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 20 Dec 2022 08:51:07 +0000
Subject: [PATCH 133/174] fixed message box

---
 lnbits/extensions/shop/templates/shop/index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 5ab0529e..c7261002 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -929,7 +929,7 @@
       </q-card-section>
     </q-card>
     <!-- CHAT BOX -->
-    <q-card style="max-height: 800px">
+    <q-card style="max-height: 600px">
       <q-card-section>
         <h6 class="text-subtitle1 q-my-none">Messages</h6>
       </q-card-section>
@@ -945,6 +945,7 @@
           emit-value
         ></q-select>
       </q-card-section>
+      <q-card-section>
       <div class="chat-container q-pa-md" ref="chatCard">
         <div class="chat-box">
           <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
@@ -959,6 +960,7 @@
             />
           </div>
         </div>
+      <q-card-section>
         <q-form @submit="sendMessage" class="full-width chat-input">
           <q-input
             ref="newMessage"
@@ -980,7 +982,9 @@
             </template>
           </q-input>
         </q-form>
+      </q-card-section>
       </div>
+    </q-card-section>
     </q-card>
     <!-- <q-card>
       <q-card-section>

From 7a1ec091042cb13781b5ae576d215aa310f17dc1 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 20 Dec 2022 09:53:37 +0000
Subject: [PATCH 134/174] add toast on add to cart

---
 .../extensions/diagonalley/templates/diagonalley/stall.html  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
index e758a7bb..9827ba9b 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
@@ -347,6 +347,11 @@
             price: item.price
           })
         }
+        this.$q.notify({
+          type: 'positive',
+          message: `${item.product} added to cart`,
+          icon: 'thumb_up'
+        })
         this.cart.products = prod
         this.updateCart(item.price)
       },

From 70a051a41332f0c2df300eb5f479fa295b06c10b Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 20 Dec 2022 16:11:56 +0000
Subject: [PATCH 135/174] make format && generate keys with schnorr

---
 lnbits/extensions/shop/crud.py                |  40 ++---
 .../shop/templates/shop/_api_docs.html        |  17 +-
 .../extensions/shop/templates/shop/index.html | 156 ++++++++----------
 .../extensions/shop/templates/shop/order.html |  21 ++-
 .../extensions/shop/templates/shop/stall.html |   4 +-
 lnbits/extensions/shop/views.py               |   4 +-
 lnbits/extensions/shop/views_api.py           |  22 +--
 7 files changed, 105 insertions(+), 159 deletions(-)

diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/shop/crud.py
index e2e5723a..43842041 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -59,17 +59,13 @@ async def update_shop_product(product_id: str, **kwargs) -> Optional[Stalls]:
         f"UPDATE shop.products SET {q} WHERE id = ?",
         (*kwargs.values(), product_id),
     )
-    row = await db.fetchone(
-        "SELECT * FROM shop.products WHERE id = ?", (product_id,)
-    )
+    row = await db.fetchone("SELECT * FROM shop.products WHERE id = ?", (product_id,))
 
     return Products(**row) if row else None
 
 
 async def get_shop_product(product_id: str) -> Optional[Products]:
-    row = await db.fetchone(
-        "SELECT * FROM shop.products WHERE id = ?", (product_id,)
-    )
+    row = await db.fetchone("SELECT * FROM shop.products WHERE id = ?", (product_id,))
     return Products(**row) if row else None
 
 
@@ -132,9 +128,7 @@ async def get_shop_zone(zone_id: str) -> Optional[Zones]:
 
 
 async def get_shop_zones(user: str) -> List[Zones]:
-    rows = await db.fetchall(
-        'SELECT * FROM shop.zones WHERE "user" = ?', (user,)
-    )
+    rows = await db.fetchall('SELECT * FROM shop.zones WHERE "user" = ?', (user,))
     return [Zones(**row) for row in rows]
 
 
@@ -182,16 +176,12 @@ async def update_shop_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
         f"UPDATE shop.stalls SET {q} WHERE id = ?",
         (*kwargs.values(), stall_id),
     )
-    row = await db.fetchone(
-        "SELECT * FROM shop.stalls WHERE id = ?", (stall_id,)
-    )
+    row = await db.fetchone("SELECT * FROM shop.stalls WHERE id = ?", (stall_id,))
     return Stalls(**row) if row else None
 
 
 async def get_shop_stall(stall_id: str) -> Optional[Stalls]:
-    row = await db.fetchone(
-        "SELECT * FROM shop.stalls WHERE id = ?", (stall_id,)
-    )
+    row = await db.fetchone("SELECT * FROM shop.stalls WHERE id = ?", (stall_id,))
     return Stalls(**row) if row else None
 
 
@@ -203,9 +193,7 @@ async def get_shop_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
     return [Stalls(**row) for row in rows]
 
 
-async def get_shop_stalls_by_ids(
-    stall_ids: Union[str, List[str]]
-) -> List[Stalls]:
+async def get_shop_stalls_by_ids(stall_ids: Union[str, List[str]]) -> List[Stalls]:
     q = ",".join(["?"] * len(stall_ids))
     rows = await db.fetchall(
         f"SELECT * FROM shop.stalls WHERE id IN ({q})", (*stall_ids,)
@@ -250,9 +238,7 @@ async def create_shop_order(data: createOrder, invoiceid: str) -> Orders:
     # return link
 
 
-async def create_shop_order_details(
-    order_id: str, data: List[createOrderDetails]
-):
+async def create_shop_order_details(order_id: str, data: List[createOrderDetails]):
     for item in data:
         item_id = urlsafe_short_hash()
         await db.execute(
@@ -280,9 +266,7 @@ async def get_shop_order_details(order_id: str) -> List[OrderDetail]:
 
 
 async def get_shop_order(order_id: str) -> Optional[Orders]:
-    row = await db.fetchone(
-        "SELECT * FROM shop.orders WHERE id = ?", (order_id,)
-    )
+    row = await db.fetchone("SELECT * FROM shop.orders WHERE id = ?", (order_id,))
     return Orders(**row) if row else None
 
 
@@ -362,9 +346,7 @@ async def get_shop_markets(user: str) -> List[Market]:
 
 
 async def get_shop_market(market_id: str) -> Optional[Market]:
-    row = await db.fetchone(
-        "SELECT * FROM shop.markets WHERE id = ?", (market_id,)
-    )
+    row = await db.fetchone("SELECT * FROM shop.markets WHERE id = ?", (market_id,))
     return Market(**row) if row else None
 
 
@@ -397,9 +379,7 @@ async def create_shop_market(data: CreateMarket):
     return market
 
 
-async def create_shop_market_stalls(
-    market_id: str, data: List[CreateMarketStalls]
-):
+async def create_shop_market_stalls(market_id: str, data: List[CreateMarketStalls]):
     for stallid in data:
         id = urlsafe_short_hash()
 
diff --git a/lnbits/extensions/shop/templates/shop/_api_docs.html b/lnbits/extensions/shop/templates/shop/_api_docs.html
index 189df2e5..3990c301 100644
--- a/lnbits/extensions/shop/templates/shop/_api_docs.html
+++ b/lnbits/extensions/shop/templates/shop/_api_docs.html
@@ -14,17 +14,18 @@
         <li>Create Shipping Zones you're willing to ship to</li>
         <li>Create a Stall to list yiur products on</li>
         <li>Create products to put on the Stall</li>
-        <li>
-          Take orders
-        </li>
-        <li>
-          Includes chat support!
-        </li>
+        <li>Take orders</li>
+        <li>Includes chat support!</li>
       </ol>
-      The first LNbits shop idea 'Diagon Alley' helped create Nostr, and soon this shop extension will have the option to work on Nostr 'Diagon Alley' mode, by the merchant, shop, and buyer all having keys, and data being routed through Nostr relays.
+      The first LNbits shop idea 'Diagon Alley' helped create Nostr, and soon
+      this shop extension will have the option to work on Nostr 'Diagon Alley'
+      mode, by the merchant, shop, and buyer all having keys, and data being
+      routed through Nostr relays.
       <br />
       <small>
-        Created by, <a href="https://github.com/talvasconcelos">Tal Vasconcelos</a>,  <a href="https://github.com/benarc">Ben Arc</a></small
+        Created by,
+        <a href="https://github.com/talvasconcelos">Tal Vasconcelos</a>,
+        <a href="https://github.com/benarc">Ben Arc</a></small
       >
       <!-- </p> -->
     </q-card-section>
diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index c7261002..ec75c107 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -253,7 +253,7 @@
         >
         </q-select>
         <q-input
-          v-if="diagonalley" 
+          v-if="diagonalley"
           v-if="keys"
           filled
           dense
@@ -261,8 +261,7 @@
           label="Public Key"
         ></q-input>
         <q-input
-
-          v-if="diagonalley" 
+          v-if="diagonalley"
           v-if="keys"
           filled
           dense
@@ -291,7 +290,7 @@
           label="Shipping Zones"
         ></q-select>
         <q-select
-          v-if="diagonalley" 
+          v-if="diagonalley"
           :options="relayOptions"
           filled
           dense
@@ -300,14 +299,14 @@
           label="Relays"
         ></q-select>
         <q-input
-        v-if="diagonalley" 
+          v-if="diagonalley"
           filled
           dense
           v-model.trim="stallDialog.data.crelays"
           label="Custom relays (seperate by comma)"
         ></q-input>
         <q-input
-          v-if="diagonalley" 
+          v-if="diagonalley"
           filled
           dense
           v-model.trim="stallDialog.data.nostrShops"
@@ -399,9 +398,7 @@
       <q-separator inset></q-separator>
       <q-card-section>
         <div class="text-h6">Shop</div>
-        <div class="text-subtitle2">
-          Make a shop of multiple stalls.
-        </div>
+        <div class="text-subtitle2">Make a shop of multiple stalls.</div>
       </q-card-section>
 
       <q-card-section>
@@ -929,7 +926,7 @@
       </q-card-section>
     </q-card>
     <!-- CHAT BOX -->
-    <q-card style="max-height: 600px">
+    <q-card>
       <q-card-section>
         <h6 class="text-subtitle1 q-my-none">Messages</h6>
       </q-card-section>
@@ -946,45 +943,45 @@
         ></q-select>
       </q-card-section>
       <q-card-section>
-      <div class="chat-container q-pa-md" ref="chatCard">
-        <div class="chat-box">
-          <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
-          <div class="chat-messages">
-            <q-chat-message
-              :key="index"
-              v-for="(message, index) in orderMessages"
-              :name="message.pubkey == keys.pubkey ? 'me' : 'customer'"
-              :text="[message.msg]"
-              :sent="message.pubkey == keys.pubkey ? true : false"
-              :bg-color="message.pubkey == keys.pubkey ? 'white' : 'light-green-2'"
-            />
-          </div>
-        </div>
-      <q-card-section>
-        <q-form @submit="sendMessage" class="full-width chat-input">
-          <q-input
-            ref="newMessage"
-            v-model="newMessage"
-            placeholder="Message"
-            class="full-width"
-            dense
-            outlined
-          >
-            <template>
-              <q-btn
-                round
-                dense
-                flat
-                type="submit"
-                icon="send"
-                color="primary"
+        <div class="chat-container" ref="chatCard">
+          <div class="chat-box">
+            <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
+            <div class="chat-messages">
+              <q-chat-message
+                :key="index"
+                v-for="(message, index) in orderMessages"
+                :name="message.pubkey == keys.pubkey ? 'me' : 'customer'"
+                :text="[message.msg]"
+                :sent="message.pubkey == keys.pubkey ? true : false"
+                :bg-color="message.pubkey == keys.pubkey ? 'white' : 'light-green-2'"
               />
-            </template>
-          </q-input>
-        </q-form>
+            </div>
+          </div>
+          <q-card-section>
+            <q-form @submit="sendMessage" class="full-width chat-input">
+              <q-input
+                ref="newMessage"
+                v-model="newMessage"
+                placeholder="Message"
+                class="full-width"
+                dense
+                outlined
+              >
+                <template>
+                  <q-btn
+                    round
+                    dense
+                    flat
+                    type="submit"
+                    icon="send"
+                    color="primary"
+                  />
+                </template>
+              </q-input>
+            </q-form>
+          </q-card-section>
+        </div>
       </q-card-section>
-      </div>
-    </q-card-section>
     </q-card>
     <!-- <q-card>
       <q-card-section>
@@ -1112,12 +1109,15 @@
 </div>
 
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
+
 <script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
+<script src="https://github.com/paulmillr/noble-secp256k1/releases/download/1.7.0/noble-secp256k1.js"></script>
 
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
 
   const pica = window.pica()
+  const secp = window.nobleSecp256k1
 
   function imgSizeFit(img, maxWidth = 1024, maxHeight = 768) {
     let ratio = Math.min(
@@ -1504,31 +1504,17 @@
         window.URL.revokeObjectURL(url)
       },
       generateKeys() {
-        LNbits.api
-          .request(
-            'GET',
-            '/shop/api/v1/keys',
-            this.g.user.wallets[0].adminkey
-          )
-          .then(response => {
-            if (response.data) {
-              this.keys = response.data
-              this.stallDialog.data.publickey = this.keys.pubkey
-              this.stallDialog.data.privatekey = this.keys.privkey
-              this.$q.localStorage.set(
-                `lnbits.shop.${this.g.user.id}`,
-                this.keys
-              )
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
+        const privkey = secp.utils.bytesToHex(secp.utils.randomPrivateKey())
+        const pubkey = secp.utils.bytesToHex(secp.schnorr.getPublicKey(privKey))
+
+        this.keys = {privKey, pubKey}
+        this.stallDialog.data.publickey = this.keys.pubkey
+        this.stallDialog.data.privatekey = this.keys.privkey
+        this.$q.localStorage.set(`lnbits.shop.${this.g.user.id}`, this.keys)
+        console.log({privKey, pubKey})
       },
       restoreKeys() {
-        let keys = this.$q.localStorage.getItem(
-          `lnbits.shop.${this.g.user.id}`
-        )
+        let keys = this.$q.localStorage.getItem(`lnbits.shop.${this.g.user.id}`)
         if (keys) {
           this.keys = keys
           this.stallDialog.data.publickey = this.keys.pubkey
@@ -1858,11 +1844,7 @@
         var self = this
 
         LNbits.api
-          .request(
-            'GET',
-            '/shop/api/v1/zones',
-            this.g.user.wallets[0].inkey
-          )
+          .request('GET', '/shop/api/v1/zones', this.g.user.wallets[0].inkey)
           .then(function (response) {
             if (response.data) {
               self.zones = response.data.map(mapZone)
@@ -1967,11 +1949,7 @@
       ////////////////////////////////////////
       getMarkets() {
         LNbits.api
-          .request(
-            'GET',
-            '/shop/api/v1/markets',
-            this.g.user.wallets[0].inkey
-          )
+          .request('GET', '/shop/api/v1/markets', this.g.user.wallets[0].inkey)
           .then(response => {
             if (response.data) {
               this.markets = response.data.map(mapMarkets)
@@ -2171,17 +2149,17 @@
             this.g.user.wallets[0].adminkey
           )
           .then(res => {
+            if (!res.data?.length) return
             this.messages = _.groupBy(res.data, 'id_conversation')
             this.checkUnreadMessages()
           })
           .catch(error => {
+            console.error(error)
             LNbits.utils.notifyApiError(error)
           })
       },
       updateLastSeenMsg(id) {
-        let data = this.$q.localStorage.getItem(
-          `lnbits.shop.${this.g.user.id}`
-        )
+        let data = this.$q.localStorage.getItem(`lnbits.shop.${this.g.user.id}`)
         let chat = {
           ...data.chat,
           [`${id}`]: {
@@ -2256,9 +2234,7 @@
         } else {
           ws_scheme = 'ws://'
         }
-        ws = new WebSocket(
-          ws_scheme + location.host + '/shop/ws/' + room_name
-        )
+        ws = new WebSocket(ws_scheme + location.host + '/shop/ws/' + room_name)
 
         function checkWebSocket(event) {
           if (ws.readyState === WebSocket.CLOSED) {
@@ -2296,9 +2272,7 @@
         await this.getOrders()
         this.getMarkets()
         await this.getAllMessages()
-        let keys = this.$q.localStorage.getItem(
-          `lnbits.shop.${this.g.user.id}`
-        )
+        let keys = this.$q.localStorage.getItem(`lnbits.shop.${this.g.user.id}`)
         if (keys) {
           this.keys = keys
         }
@@ -2319,7 +2293,8 @@
     position: relative;
     display: grid;
     grid-template-rows: 1fr auto;
-    height: calc(100vh - 140px);
+    /*height: calc(100vh - 200px);*/
+    height: 50vh;
   }
 
   .chat-box {
@@ -2327,6 +2302,7 @@
     flex-direction: column-reverse;
     padding: 1rem;
     overflow-y: auto;
+    margin-left: auto;
   }
 
   .chat-messages {
diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index 91c7ea38..486ada40 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -2,7 +2,7 @@
 <div class="row q-col-gutter-md flex">
   <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
     <q-card>
-      <div class="chat-container q-pa-md">
+      <div class="chat-container">
         <div class="chat-box">
           <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
           <div class="chat-messages">
@@ -102,7 +102,11 @@
       <q-card-section>
         <q-separator></q-separator>
         <q-list>
-          <q-expansion-item v-if="diagonalley"  group="extras" icon="vpn_key" label="Keys"
+          <q-expansion-item
+            v-if="diagonalley"
+            group="extras"
+            icon="vpn_key"
+            label="Keys"
             ><p>
               Bellow are the keys needed to contact the merchant. They are
               stored in the browser!
@@ -197,7 +201,7 @@
   </div>
   <!-- RESTORE KEYS DIALOG -->
   <q-dialog
-  v-if="diagonalley" 
+    v-if="diagonalley"
     v-model="keysDialog.show"
     position="top"
     @hide="clearRestoreKeyDialog"
@@ -398,9 +402,7 @@
         } else {
           ws_scheme = 'ws://'
         }
-        ws = new WebSocket(
-          ws_scheme + location.host + '/shop/ws/' + room_name
-        )
+        ws = new WebSocket(ws_scheme + location.host + '/shop/ws/' + room_name)
 
         function checkWebSocket(event) {
           if (ws.readyState === WebSocket.CLOSED) {
@@ -448,8 +450,7 @@
         }
       })
 
-      let data =
-        this.$q.localStorage.getItem(`lnbits.shop.data`) || false
+      let data = this.$q.localStorage.getItem(`lnbits.shop.data`) || false
 
       if (data) {
         this.user = data
@@ -486,7 +487,8 @@
     position: relative;
     display: grid;
     grid-template-rows: 1fr auto;
-    height: calc(100vh - 133px);
+    /*height: calc(100vh - 200px);*/
+    height: 50vh;
   }
 
   .chat-box {
@@ -494,6 +496,7 @@
     flex-direction: column-reverse;
     padding: 1rem;
     overflow-y: auto;
+    margin-left: auto;
   }
 
   .chat-messages {
diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index 282fb293..70a030ac 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -163,7 +163,7 @@
           label="Name *optional"
         ></q-input>
         <q-input
-          v-if="diagonalley" 
+          v-if="diagonalley"
           filled
           dense
           v-model.trim="checkoutDialog.data.pubkey"
@@ -280,7 +280,7 @@
         stall: null,
         products: [],
         searchText: null,
-        diagonalley:false,
+        diagonalley: false,
         cart: {
           total: 0,
           size: 0,
diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index bb36d683..f8f44060 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -78,9 +78,7 @@ async def display(request: Request, market_id):
 
     stalls = await get_shop_market_stalls(market_id)
     stalls_ids = [stall.id for stall in stalls]
-    products = [
-        product.dict() for product in await get_shop_products(stalls_ids)
-    ]
+    products = [product.dict() for product in await get_shop_products(stalls_ids)]
 
     return shop_renderer().TemplateResponse(
         "shop/market.html",
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index 2899d2a0..de04a839 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -346,9 +346,7 @@ async def api_shop_order_shipped(
             order_id,
         ),
     )
-    order = await db.fetchone(
-        "SELECT * FROM shop.orders WHERE id = ?", (order_id,)
-    )
+    order = await db.fetchone("SELECT * FROM shop.orders WHERE id = ?", (order_id,))
 
     return order
 
@@ -361,15 +359,11 @@ async def api_shop_stall_products(
     stall_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
 
-    rows = await db.fetchone(
-        "SELECT * FROM shop.stalls WHERE id = ?", (stall_id,)
-    )
+    rows = await db.fetchone("SELECT * FROM shop.stalls WHERE id = ?", (stall_id,))
     if not rows:
         return {"message": "Stall does not exist."}
 
-    products = db.fetchone(
-        "SELECT * FROM shop.products WHERE wallet = ?", (rows[1],)
-    )
+    products = db.fetchone("SELECT * FROM shop.products WHERE wallet = ?", (rows[1],))
     if not products:
         return {"message": "No products"}
 
@@ -441,10 +435,7 @@ async def api_shop_stall_checkshipped(
 async def api_shop_markets(wallet: WalletTypeInfo = Depends(get_key_type)):
     # await get_shop_market_stalls(market_id="FzpWnMyHQMcRppiGVua4eY")
     try:
-        return [
-            market.dict()
-            for market in await get_shop_markets(wallet.wallet.user)
-        ]
+        return [market.dict() for market in await get_shop_markets(wallet.wallet.user)]
     except:
         return {"message": "We could not retrieve the markets."}
 
@@ -498,10 +489,7 @@ async def api_shop_generate_keys():
 async def api_get_merchant_messages(
     orders: str = Query(...), wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-
-    return [
-        msg.dict() for msg in await get_shop_chat_by_merchant(orders.split(","))
-    ]
+    return [msg.dict() for msg in await get_shop_chat_by_merchant(orders.split(","))]
 
 
 @shop_ext.get("/api/v1/chat/messages/{room_name}")

From dd09eac2a52e019948ec266578f665073da9ad49 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 20 Dec 2022 16:44:00 +0000
Subject: [PATCH 136/174] generate keys on frontend

---
 .../extensions/shop/templates/shop/order.html | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index 486ada40..717e4154 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -243,6 +243,8 @@
   </q-dialog>
 </div>
 {% endblock %} {% block scripts %}
+<script src="https://github.com/paulmillr/noble-secp256k1/releases/download/1.7.0/noble-secp256k1.js"></script>
+
 <script>
   const mapChatMsg = msg => {
     let obj = {}
@@ -253,6 +255,7 @@
     return obj
   }
   Vue.component(VueQrcode.name, VueQrcode)
+  const secp = window.nobleSecp256k1
   new Vue({
     el: '#vue',
     mixins: [windowMixin],
@@ -342,28 +345,15 @@
             this.user = null
           })
       },
-      async generateKeys() {
+      generateKeys() {
         //check if the keys are set
         if ('publickey' in this.user.keys && 'privatekey' in this.user.keys)
           return
 
-        return await LNbits.api
-          .request('GET', `/shop/api/v1/keys`, null)
-          .then(response => {
-            if (response.data) {
-              let data = {
-                keys: {
-                  privatekey: response.data.privkey,
-                  publickey: response.data.pubkey
-                }
-              }
-              this.user.keys = data.keys
-              return
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
+        const privkey = secp.utils.bytesToHex(secp.utils.randomPrivateKey())
+        const pubkey = secp.utils.bytesToHex(secp.schnorr.getPublicKey(privKey))
+
+        this.user.keys = {privatekey: privkey, publickey: pubkey}
       },
       async getMessages(room_name, all = false) {
         await LNbits.api

From f1f68658d2d858f423a481e75ca557220c1572c2 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 20 Dec 2022 16:44:33 +0000
Subject: [PATCH 137/174] make partials for readability

---
 .../shop/templates/shop/_chat_box.html        |  57 ++
 .../shop/templates/shop/_dialogs.html         | 384 +++++++
 .../shop/templates/shop/_tables.html          | 428 ++++++++
 .../extensions/shop/templates/shop/index.html | 962 +-----------------
 4 files changed, 872 insertions(+), 959 deletions(-)
 create mode 100644 lnbits/extensions/shop/templates/shop/_chat_box.html
 create mode 100644 lnbits/extensions/shop/templates/shop/_dialogs.html
 create mode 100644 lnbits/extensions/shop/templates/shop/_tables.html

diff --git a/lnbits/extensions/shop/templates/shop/_chat_box.html b/lnbits/extensions/shop/templates/shop/_chat_box.html
new file mode 100644
index 00000000..87755e41
--- /dev/null
+++ b/lnbits/extensions/shop/templates/shop/_chat_box.html
@@ -0,0 +1,57 @@
+<q-card>
+  <q-card-section>
+    <h6 class="text-subtitle1 q-my-none">Messages</h6>
+  </q-card-section>
+  <q-card-section class="q-pa-none">
+    <q-separator></q-separator>
+  </q-card-section>
+  <q-card-section>
+    <q-select
+      v-model="customerKey"
+      :options="Object.keys(messages).map(k => ({label: `${k.slice(0, 25)}...`, value: k}))"
+      label="Customers"
+      @input="chatRoom(customerKey)"
+      emit-value
+    ></q-select>
+  </q-card-section>
+  <q-card-section>
+    <div class="chat-container" ref="chatCard">
+      <div class="chat-box">
+        <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
+        <div class="chat-messages">
+          <q-chat-message
+            :key="index"
+            v-for="(message, index) in orderMessages"
+            :name="message.pubkey == keys.pubkey ? 'me' : 'customer'"
+            :text="[message.msg]"
+            :sent="message.pubkey == keys.pubkey ? true : false"
+            :bg-color="message.pubkey == keys.pubkey ? 'white' : 'light-green-2'"
+          />
+        </div>
+      </div>
+      <q-card-section>
+        <q-form @submit="sendMessage" class="full-width chat-input">
+          <q-input
+            ref="newMessage"
+            v-model="newMessage"
+            placeholder="Message"
+            class="full-width"
+            dense
+            outlined
+          >
+            <template>
+              <q-btn
+                round
+                dense
+                flat
+                type="submit"
+                icon="send"
+                color="primary"
+              />
+            </template>
+          </q-input>
+        </q-form>
+      </q-card-section>
+    </div>
+  </q-card-section>
+</q-card>
diff --git a/lnbits/extensions/shop/templates/shop/_dialogs.html b/lnbits/extensions/shop/templates/shop/_dialogs.html
new file mode 100644
index 00000000..600897b6
--- /dev/null
+++ b/lnbits/extensions/shop/templates/shop/_dialogs.html
@@ -0,0 +1,384 @@
+<!-- PRODUCT DIALOG -->
+<q-dialog v-model="productDialog.show" position="top">
+  <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+    <q-form @submit="sendProductFormData" class="q-gutter-md">
+      <q-select
+        filled
+        dense
+        emit-value
+        v-model="productDialog.data.stall"
+        :options="stalls.map(s => ({label: s.name, value: s.id}))"
+        label="Stall"
+      >
+      </q-select>
+      <q-input
+        filled
+        dense
+        v-model.trim="productDialog.data.product"
+        label="Product"
+      ></q-input>
+
+      <q-input
+        filled
+        dense
+        v-model.trim="productDialog.data.description"
+        label="Description"
+      ></q-input>
+      <!-- <div class="row"> -->
+      <!-- <div class="col-5">
+            <q-select
+              filled
+              dense
+              multiple
+              v-model.trim="productDialog.data.categories"
+              :options="categories"
+              label="Categories"
+              class="q-pr-sm"
+            ></q-select>
+          </div> -->
+      <!-- <div class="col-7"> -->
+      <q-select
+        filled
+        multiple
+        dense
+        emit-value
+        v-model.trim="productDialog.data.categories"
+        use-input
+        use-chips
+        multiple
+        hide-dropdown-icon
+        input-debounce="0"
+        new-value-mode="add-unique"
+        label="Categories"
+        placeholder="crafts,robots,etc"
+        hint="Hit Enter to add"
+      ></q-select>
+      <!-- </div> -->
+      <!-- </div> -->
+
+      <q-file
+        class="q-pr-md"
+        filled
+        dense
+        capture="environment"
+        accept="image/jpeg, image/png"
+        :max-file-size="3*1024**2"
+        label="Small image (optional)"
+        clearable
+        @input="imageAdded"
+        @clear="imageCleared"
+      >
+        <template v-if="productDialog.data.image" v-slot:before>
+          <img style="height: 1em" :src="productDialog.data.image" />
+        </template>
+        <template v-if="productDialog.data.image" v-slot:append>
+          <q-icon
+            name="cancel"
+            @click.stop.prevent="imageCleared"
+            class="cursor-pointer"
+          />
+        </template>
+      </q-file>
+      <q-input
+        filled
+        dense
+        v-model.number="productDialog.data.price"
+        type="number"
+        label="Price"
+      ></q-input>
+      <q-input
+        filled
+        dense
+        v-model.number="productDialog.data.quantity"
+        type="number"
+        label="Quantity"
+      ></q-input>
+
+      <div class="row q-mt-lg">
+        <q-btn
+          v-if="productDialog.data.id"
+          unelevated
+          color="primary"
+          type="submit"
+          >Update Product</q-btn
+        >
+
+        <q-btn
+          v-else
+          unelevated
+          color="primary"
+          :disable="productDialog.data.price == null
+              || productDialog.data.product == null
+              || productDialog.data.description == null
+              || productDialog.data.quantity == null"
+          type="submit"
+          >Create Product</q-btn
+        >
+
+        <q-btn
+          v-close-popup
+          flat
+          @click="resetDialog('productDialog')"
+          color="grey"
+          class="q-ml-auto"
+          >Cancel</q-btn
+        >
+      </div>
+    </q-form>
+  </q-card>
+</q-dialog>
+<!-- ZONE DIALOG -->
+<q-dialog v-model="zoneDialog.show" position="top">
+  <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+    <q-form @submit="sendZoneFormData" class="q-gutter-md">
+      <q-select
+        filled
+        dense
+        multiple
+        :options="shippingZoneOptions"
+        label="Countries"
+        v-model.trim="zoneDialog.data.countries"
+      ></q-select>
+      <q-input
+        filled
+        dense
+        type="number"
+        v-model.trim="zoneDialog.data.cost"
+        label="Cost (sats)"
+      ></q-input>
+      <div class="row q-mt-lg">
+        <q-btn
+          v-if="zoneDialog.data.id"
+          unelevated
+          color="primary"
+          type="submit"
+          >Update Shipping Zone</q-btn
+        >
+        <q-btn
+          v-else
+          unelevated
+          color="primary"
+          :disable="zoneDialog.data.countries == null
+              || zoneDialog.data.cost == null"
+          type="submit"
+          >Create Shipping Zone</q-btn
+        >
+
+        <q-btn
+          v-close-popup
+          flat
+          @click="resetDialog('zoneDialog')"
+          color="grey"
+          class="q-ml-auto"
+          >Cancel</q-btn
+        >
+      </div>
+    </q-form>
+  </q-card>
+</q-dialog>
+<!-- MARKETPLACE/SHOP DIALOG -->
+<q-dialog v-model="marketDialog.show" position="top">
+  <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+    <q-form @submit="sendMarketplaceFormData" class="q-gutter-md">
+      <q-toggle
+        label="Activate marketplace"
+        color="primary"
+        v-model="marketDialog.data.activate"
+      ></q-toggle>
+      <q-select
+        filled
+        dense
+        multiple
+        emit-value
+        :options="stalls.map(s => ({label: s.name, value: s.id}))"
+        label="Stalls"
+        v-model.trim="marketDialog.data.stalls"
+      ></q-select>
+      <q-input
+        filled
+        dense
+        v-model.trim="marketDialog.data.name"
+        label="Name"
+      ></q-input>
+      <div class="row q-mt-lg">
+        <q-btn
+          v-if="marketDialog.data.id"
+          unelevated
+          color="primary"
+          type="submit"
+          >Update Marketplace</q-btn
+        >
+        <q-btn
+          v-else
+          unelevated
+          color="primary"
+          :disable="marketDialog.data.activate == null
+              || marketDialog.data.stalls == null"
+          type="submit"
+          >Launch Marketplace</q-btn
+        >
+
+        <q-btn
+          v-close-popup
+          flat
+          @click="resetDialog('marketDialog')"
+          color="grey"
+          class="q-ml-auto"
+          >Cancel</q-btn
+        >
+      </div>
+    </q-form>
+  </q-card>
+</q-dialog>
+<!-- STALL/STORE DIALOG -->
+<q-dialog v-model="stallDialog.show" position="top">
+  <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+    <q-form @submit="sendStallFormData" class="q-gutter-md">
+      <q-input
+        filled
+        dense
+        v-model.trim="stallDialog.data.name"
+        label="Name"
+      ></q-input>
+      <q-select
+        filled
+        dense
+        emit-value
+        v-model="stallDialog.data.wallet"
+        :options="g.user.walletOptions"
+        label="Wallet *"
+      >
+      </q-select>
+      <q-input
+        v-if="diagonalley"
+        v-if="keys"
+        filled
+        dense
+        v-model.trim="stallDialog.data.publickey"
+        label="Public Key"
+      ></q-input>
+      <q-input
+        v-if="diagonalley"
+        v-if="keys"
+        filled
+        dense
+        v-model.trim="stallDialog.data.privatekey"
+        label="Private Key"
+      ></q-input>
+      <!-- NOSTR -->
+      <div v-if="diagonalley" class="row">
+        <div class="col-5">
+          <q-btn unelevated @click="generateKeys" color="primary"
+            >Generate keys</q-btn
+          >
+        </div>
+        <div class="col-5">
+          <q-btn unelevated @click="restoreKeys" color="primary"
+            >Restore keys</q-btn
+          >
+        </div>
+      </div>
+      <q-select
+        :options="zoneOptions"
+        filled
+        dense
+        multiple
+        v-model.trim="stallDialog.data.shippingzones"
+        label="Shipping Zones"
+      ></q-select>
+      <q-select
+        v-if="diagonalley"
+        :options="relayOptions"
+        filled
+        dense
+        multiple
+        v-model.trim="stallDialog.data.relays"
+        label="Relays"
+      ></q-select>
+      <q-input
+        v-if="diagonalley"
+        filled
+        dense
+        v-model.trim="stallDialog.data.crelays"
+        label="Custom relays (seperate by comma)"
+      ></q-input>
+      <q-input
+        v-if="diagonalley"
+        filled
+        dense
+        v-model.trim="stallDialog.data.nostrShops"
+        label="Nostr shop public keys (seperate by comma)"
+      ></q-input>
+
+      <div class="row q-mt-lg">
+        <q-btn
+          v-if="stallDialog.data.id"
+          unelevated
+          color="primary"
+          type="submit"
+          >Update Stall</q-btn
+        >
+        <q-btn
+          v-else
+          unelevated
+          color="primary"
+          :disable="stallDialog.data.wallet == null
+              || stallDialog.data.shippingzones == null"
+          type="submit"
+          >Create Stall</q-btn
+        >
+        <q-btn
+          v-close-popup
+          flat
+          @click="resetDialog('stallDialog')"
+          color="grey"
+          class="q-ml-auto"
+          >Cancel</q-btn
+        >
+      </div>
+    </q-form>
+  </q-card>
+</q-dialog>
+<q-dialog v-model="onboarding.show">
+  <q-card class="q-pa-lg">
+    <h6 class="q-my-md text-primary">How to use Shop</h6>
+    <q-stepper v-model="step" color="primary" vertical animated>
+      <q-step
+        :name="1"
+        title="Create a Shipping Zone"
+        icon="settings"
+        :done="step > 1"
+      >
+        Create Shipping Zones you're willing to ship to. You can define
+        different values for different zones.
+        <q-stepper-navigation>
+          <q-btn @click="step = step + 1" color="primary" label="Next" />
+        </q-stepper-navigation>
+      </q-step>
+      <q-step
+        :name="2"
+        title="Create a Stall"
+        icon="create_new_folder"
+        :done="step > 2"
+      >
+        Create a Stall and provide private and public keys to use for
+        communication. If you don't have one, LNbits will create a key pair for
+        you. It will be saved and can be used on other stalls.
+        <q-stepper-navigation>
+          <q-btn @click="step = step + 1" color="primary" label="Next" />
+        </q-stepper-navigation>
+      </q-step>
+
+      <q-step :name="3" title="Create Products" icon="assignment">
+        Create your products, add a small description and an image. Choose to
+        what stall, if you have more than one, it belongs to
+        <q-stepper-navigation>
+          <q-btn @click="onboarding.finish" color="primary" label="Finish" />
+        </q-stepper-navigation>
+        <div>
+          <q-checkbox v-model="onboarding.showAgain" label="Show this again?" />
+        </div>
+      </q-step>
+    </q-stepper>
+  </q-card>
+</q-dialog>
diff --git a/lnbits/extensions/shop/templates/shop/_tables.html b/lnbits/extensions/shop/templates/shop/_tables.html
new file mode 100644
index 00000000..9b731c20
--- /dev/null
+++ b/lnbits/extensions/shop/templates/shop/_tables.html
@@ -0,0 +1,428 @@
+<q-card>
+  <!-- ORDERS TABLE -->
+  <q-card-section>
+    <div class="row items-center no-wrap q-mb-md">
+      <div class="col">
+        <h5 class="text-subtitle1 q-my-none">Orders</h5>
+      </div>
+      <div class="col-auto">
+        <q-btn flat color="grey" @click="exportOrdersCSV">Export to CSV</q-btn>
+      </div>
+    </div>
+    <q-table
+      dense
+      flat
+      :data="orders"
+      row-key="id"
+      :columns="ordersTable.columns"
+      :pagination.sync="ordersTable.pagination"
+    >
+      {% raw %}
+      <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">
+            {{ col.label }}
+          </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
+              size="sm"
+              color="accent"
+              round
+              dense
+              @click="props.expand = !props.expand"
+              :icon="props.expand ? 'remove' : 'add'"
+            />
+          </q-td>
+          <q-td auto-width>
+            <q-btn
+              size="sm"
+              color="green"
+              dense
+              icon="chat"
+              @click="chatRoom(props.row.invoiceid)"
+            >
+              <q-badge
+                v-if="props.row.unread"
+                color="red"
+                rounded
+                floating
+                style="padding: 6px; border-radius: 6px"
+              />
+            </q-btn>
+          </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.value }}
+          </q-td>
+
+          <q-td auto-width>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="shipOrder(props.row.id)"
+              icon="add_shopping_cart"
+              color="green"
+            >
+              <q-tooltip> Product shipped? </q-tooltip>
+            </q-btn>
+          </q-td>
+          <q-td auto-width>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="deleteOrder(props.row.id)"
+              icon="cancel"
+              color="pink"
+            ></q-btn>
+          </q-td>
+        </q-tr>
+        <q-tr v-show="props.expand" :props="props">
+          <q-td colspan="100%">
+            <template>
+              <div class="q-pa-md">
+                <q-list>
+                  <q-item-label header>Order Details</q-item-label>
+
+                  <q-item v-for="col in props.row.details" :key="col.id">
+                    <q-item-section>
+                      <q-item-label>Products</q-item-label>
+                      <q-item-label caption
+                        >{{ products.length && (_.findWhere(products, {id:
+                        col.product_id})).product }}</q-item-label
+                      >
+                      <q-item-label caption
+                        >Quantity: {{ col.quantity }}</q-item-label
+                      >
+                    </q-item-section>
+                  </q-item>
+
+                  <q-item>
+                    <q-item-section>
+                      <q-item-label>Shipping to</q-item-label>
+                      <q-item-label caption
+                        >{{ props.row.address }}</q-item-label
+                      >
+                    </q-item-section>
+                  </q-item>
+
+                  <q-item>
+                    <q-item-section>
+                      <q-item-label>User info</q-item-label>
+                      <q-item-label caption v-if="props.row.username"
+                        >{{ props.row.username }}</q-item-label
+                      >
+                      <q-item-label caption>{{ props.row.email }}</q-item-label>
+                      <q-item-label caption v-if="props.row.pubkey"
+                        >{{ props.row.pubkey }}</q-item-label
+                      >
+                    </q-item-section>
+                  </q-item>
+                  <q-item>
+                    <q-item-section>
+                      <q-item-label>Total</q-item-label>
+                      <q-item-label>{{ props.row.total }}</q-item-label>
+                      <!-- <q-icon name="star" color="yellow" /> -->
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </div>
+            </template>
+          </q-td>
+        </q-tr>
+      </template>
+      {% endraw %}
+    </q-table>
+  </q-card-section>
+</q-card>
+
+<q-card>
+  <!-- PRODUCTS TABLE -->
+  <q-card-section>
+    <div class="row items-center no-wrap q-mb-md">
+      <div class="col">
+        <h5 class="text-subtitle1 q-my-none">Products</h5>
+      </div>
+      <div class="col-auto">
+        <q-btn flat color="grey" @click="exportProductsCSV"
+          >Export to CSV</q-btn
+        >
+      </div>
+    </div>
+    <q-table
+      dense
+      flat
+      :data="products"
+      row-key="id"
+      :columns="productsTable.columns"
+      :pagination.sync="productsTable.pagination"
+    >
+      {% raw %}
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th auto-width></q-th>
+          <q-th v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.label }}
+          </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
+              disabled
+              unelevated
+              dense
+              size="xs"
+              icon="add_shopping_cart"
+              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+              type="a"
+              :href="props.row.wallet"
+              target="_blank"
+            ></q-btn>
+            <q-tooltip> Link to pass to stall relay </q-tooltip>
+          </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.value }}
+          </q-td>
+          <q-td class="text-center" auto-width>
+            <img
+              v-if="props.row.image"
+              :src="props.row.image"
+              style="height: 1.5em"
+            />
+          </q-td>
+          <q-td auto-width>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="openProductUpdateDialog(props.row.id)"
+              icon="edit"
+              color="light-blue"
+            ></q-btn>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="deleteProduct(props.row.id)"
+              icon="cancel"
+              color="pink"
+            ></q-btn>
+          </q-td>
+        </q-tr>
+      </template>
+      {% endraw %}
+    </q-table>
+  </q-card-section>
+</q-card>
+
+<q-card>
+  <!-- STALLS TABLE -->
+  <q-card-section>
+    <div class="row items-center no-wrap q-mb-md">
+      <div class="col">
+        <h5 class="text-subtitle1 q-my-none">Market Stalls</h5>
+      </div>
+      <div class="col-auto">
+        <q-btn flat color="grey" @click="exportStallsCSV">Export to CSV</q-btn>
+      </div>
+    </div>
+    <q-table
+      dense
+      flat
+      :data="stalls"
+      row-key="id"
+      :columns="stallTable.columns"
+      :pagination.sync="stallTable.pagination"
+    >
+      {% raw %}
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th auto-width></q-th>
+          <q-th v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.label }}
+          </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="storefront"
+              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+              type="a"
+              :href="'/shop/stalls/' + props.row.id"
+              target="_blank"
+            ></q-btn>
+            <q-tooltip> Stall simple UI shopping cart </q-tooltip>
+          </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.value }}
+          </q-td>
+          <q-td auto-width>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="openStallUpdateDialog(props.row.id)"
+              icon="edit"
+              color="light-blue"
+            ></q-btn>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="deleteStall(props.row.id)"
+              icon="cancel"
+              color="pink"
+            ></q-btn>
+          </q-td>
+        </q-tr>
+      </template>
+      {% endraw %}
+    </q-table>
+  </q-card-section>
+</q-card>
+
+<q-card v-if="markets.length">
+  <!-- MARKETPLACES TABLE -->
+  <q-card-section>
+    <div class="row items-center no-wrap q-mb-md">
+      <div class="col">
+        <h5 class="text-subtitle1 q-my-none">Marketplaces</h5>
+      </div>
+      <div class="col-auto">
+        <q-btn flat color="grey" @click="exportStallsCSV">Export to CSV</q-btn>
+      </div>
+    </div>
+    <q-table
+      dense
+      flat
+      :data="markets"
+      row-key="id"
+      :columns="marketTable.columns"
+      :pagination.sync="marketTable.pagination"
+    >
+      {% raw %}
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th auto-width></q-th>
+          <q-th v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.label }}
+          </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="storefront"
+              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+              type="a"
+              :href="'/shop/market/' + props.row.id"
+              target="_blank"
+            ></q-btn>
+            <q-tooltip> Link to pass to stall relay </q-tooltip>
+          </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.value }}
+          </q-td>
+          <q-td auto-width>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="openStallUpdateDialog(props.row.id)"
+              icon="edit"
+              color="light-blue"
+            ></q-btn>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="deleteStall(props.row.id)"
+              icon="cancel"
+              color="pink"
+            ></q-btn>
+          </q-td>
+        </q-tr>
+      </template>
+      {% endraw %}
+    </q-table>
+  </q-card-section>
+</q-card>
+
+<q-card>
+  <!-- ZONES TABLE -->
+  <q-card-section>
+    <div class="row items-center no-wrap q-mb-md">
+      <div class="col">
+        <h5 class="text-subtitle1 q-my-none">Shipping Zones</h5>
+      </div>
+      <div class="col-auto">
+        <q-btn flat color="grey" @click="exportZonesCSV">Export to CSV</q-btn>
+      </div>
+    </div>
+    <q-table
+      dense
+      flat
+      :data="zones"
+      row-key="id"
+      :columns="zonesTable.columns"
+      :pagination.sync="zonesTable.pagination"
+    >
+      {% raw %}
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.label }}
+          </q-th>
+          <q-th auto-width></q-th>
+        </q-tr>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            {{ col.value }}
+          </q-td>
+          <q-td auto-width>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="openZoneUpdateDialog(props.row.id)"
+              icon="edit"
+              color="light-blue"
+            ></q-btn>
+            <q-btn
+              flat
+              dense
+              size="xs"
+              @click="deleteZone(props.row.id)"
+              icon="cancel"
+              color="pink"
+            ></q-btn>
+          </q-td>
+        </q-tr>
+      </template>
+      {% endraw %}
+    </q-table>
+  </q-card-section>
+</q-card>
diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index ec75c107..e2241e37 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -1,348 +1,7 @@
 {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
 %} {% block page %}
 <div class="row q-col-gutter-md">
-  <!-- PRODUCT DIALOG -->
-  <q-dialog v-model="productDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
-      <q-form @submit="sendProductFormData" class="q-gutter-md">
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="productDialog.data.stall"
-          :options="stalls.map(s => ({label: s.name, value: s.id}))"
-          label="Stall"
-        >
-        </q-select>
-        <q-input
-          filled
-          dense
-          v-model.trim="productDialog.data.product"
-          label="Product"
-        ></q-input>
-
-        <q-input
-          filled
-          dense
-          v-model.trim="productDialog.data.description"
-          label="Description"
-        ></q-input>
-        <!-- <div class="row"> -->
-        <!-- <div class="col-5">
-            <q-select
-              filled
-              dense
-              multiple
-              v-model.trim="productDialog.data.categories"
-              :options="categories"
-              label="Categories"
-              class="q-pr-sm"
-            ></q-select>
-          </div> -->
-        <!-- <div class="col-7"> -->
-        <q-select
-          filled
-          multiple
-          dense
-          emit-value
-          v-model.trim="productDialog.data.categories"
-          use-input
-          use-chips
-          multiple
-          hide-dropdown-icon
-          input-debounce="0"
-          new-value-mode="add-unique"
-          label="Categories"
-          placeholder="crafts,robots,etc"
-          hint="Hit Enter to add"
-        ></q-select>
-        <!-- </div> -->
-        <!-- </div> -->
-
-        <q-file
-          class="q-pr-md"
-          filled
-          dense
-          capture="environment"
-          accept="image/jpeg, image/png"
-          :max-file-size="3*1024**2"
-          label="Small image (optional)"
-          clearable
-          @input="imageAdded"
-          @clear="imageCleared"
-        >
-          <template v-if="productDialog.data.image" v-slot:before>
-            <img style="height: 1em" :src="productDialog.data.image" />
-          </template>
-          <template v-if="productDialog.data.image" v-slot:append>
-            <q-icon
-              name="cancel"
-              @click.stop.prevent="imageCleared"
-              class="cursor-pointer"
-            />
-          </template>
-        </q-file>
-        <q-input
-          filled
-          dense
-          v-model.number="productDialog.data.price"
-          type="number"
-          label="Price"
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.number="productDialog.data.quantity"
-          type="number"
-          label="Quantity"
-        ></q-input>
-
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="productDialog.data.id"
-            unelevated
-            color="primary"
-            type="submit"
-            >Update Product</q-btn
-          >
-
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="productDialog.data.price == null
-              || productDialog.data.product == null
-              || productDialog.data.description == null
-              || productDialog.data.quantity == null"
-            type="submit"
-            >Create Product</q-btn
-          >
-
-          <q-btn
-            v-close-popup
-            flat
-            @click="resetDialog('productDialog')"
-            color="grey"
-            class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-  <!-- ZONE DIALOG -->
-  <q-dialog v-model="zoneDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
-      <q-form @submit="sendZoneFormData" class="q-gutter-md">
-        <q-select
-          filled
-          dense
-          multiple
-          :options="shippingZoneOptions"
-          label="Countries"
-          v-model.trim="zoneDialog.data.countries"
-        ></q-select>
-        <q-input
-          filled
-          dense
-          type="number"
-          v-model.trim="zoneDialog.data.cost"
-          label="Cost (sats)"
-        ></q-input>
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="zoneDialog.data.id"
-            unelevated
-            color="primary"
-            type="submit"
-            >Update Shipping Zone</q-btn
-          >
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="zoneDialog.data.countries == null
-              || zoneDialog.data.cost == null"
-            type="submit"
-            >Create Shipping Zone</q-btn
-          >
-
-          <q-btn
-            v-close-popup
-            flat
-            @click="resetDialog('zoneDialog')"
-            color="grey"
-            class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-  <!-- MARKETPLACE/SHOP DIALOG -->
-  <q-dialog v-model="marketDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
-      <q-form @submit="sendMarketplaceFormData" class="q-gutter-md">
-        <q-toggle
-          label="Activate marketplace"
-          color="primary"
-          v-model="marketDialog.data.activate"
-        ></q-toggle>
-        <q-select
-          filled
-          dense
-          multiple
-          emit-value
-          :options="stalls.map(s => ({label: s.name, value: s.id}))"
-          label="Stalls"
-          v-model.trim="marketDialog.data.stalls"
-        ></q-select>
-        <q-input
-          filled
-          dense
-          v-model.trim="marketDialog.data.name"
-          label="Name"
-        ></q-input>
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="marketDialog.data.id"
-            unelevated
-            color="primary"
-            type="submit"
-            >Update Marketplace</q-btn
-          >
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="marketDialog.data.activate == null
-              || marketDialog.data.stalls == null"
-            type="submit"
-            >Launch Marketplace</q-btn
-          >
-
-          <q-btn
-            v-close-popup
-            flat
-            @click="resetDialog('marketDialog')"
-            color="grey"
-            class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-  <!-- STALL/STORE DIALOG -->
-  <q-dialog v-model="stallDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
-      <q-form @submit="sendStallFormData" class="q-gutter-md">
-        <q-input
-          filled
-          dense
-          v-model.trim="stallDialog.data.name"
-          label="Name"
-        ></q-input>
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="stallDialog.data.wallet"
-          :options="g.user.walletOptions"
-          label="Wallet *"
-        >
-        </q-select>
-        <q-input
-          v-if="diagonalley"
-          v-if="keys"
-          filled
-          dense
-          v-model.trim="stallDialog.data.publickey"
-          label="Public Key"
-        ></q-input>
-        <q-input
-          v-if="diagonalley"
-          v-if="keys"
-          filled
-          dense
-          v-model.trim="stallDialog.data.privatekey"
-          label="Private Key"
-        ></q-input>
-        <!-- NOSTR -->
-        <div v-if="diagonalley" class="row">
-          <div class="col-5">
-            <q-btn unelevated @click="generateKeys" color="primary"
-              >Generate keys</q-btn
-            >
-          </div>
-          <div class="col-5">
-            <q-btn unelevated @click="restoreKeys" color="primary"
-              >Restore keys</q-btn
-            >
-          </div>
-        </div>
-        <q-select
-          :options="zoneOptions"
-          filled
-          dense
-          multiple
-          v-model.trim="stallDialog.data.shippingzones"
-          label="Shipping Zones"
-        ></q-select>
-        <q-select
-          v-if="diagonalley"
-          :options="relayOptions"
-          filled
-          dense
-          multiple
-          v-model.trim="stallDialog.data.relays"
-          label="Relays"
-        ></q-select>
-        <q-input
-          v-if="diagonalley"
-          filled
-          dense
-          v-model.trim="stallDialog.data.crelays"
-          label="Custom relays (seperate by comma)"
-        ></q-input>
-        <q-input
-          v-if="diagonalley"
-          filled
-          dense
-          v-model.trim="stallDialog.data.nostrShops"
-          label="Nostr shop public keys (seperate by comma)"
-        ></q-input>
-
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="stallDialog.data.id"
-            unelevated
-            color="primary"
-            type="submit"
-            >Update Stall</q-btn
-          >
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="stallDialog.data.wallet == null
-              || stallDialog.data.shippingzones == null"
-            type="submit"
-            >Create Stall</q-btn
-          >
-          <q-btn
-            v-close-popup
-            flat
-            @click="resetDialog('stallDialog')"
-            color="grey"
-            class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
+  {% include "shop/_dialogs.html" %}
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
@@ -427,444 +86,7 @@
       </q-card-section>
     </q-card>
 
-    <q-card>
-      <!-- ORDERS TABLE -->
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Orders</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportOrdersCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="orders"
-          row-key="id"
-          :columns="ordersTable.columns"
-          :pagination.sync="ordersTable.pagination"
-        >
-          {% raw %}
-          <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">
-                {{ col.label }}
-              </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
-                  size="sm"
-                  color="accent"
-                  round
-                  dense
-                  @click="props.expand = !props.expand"
-                  :icon="props.expand ? 'remove' : 'add'"
-                />
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  size="sm"
-                  color="green"
-                  dense
-                  icon="chat"
-                  @click="chatRoom(props.row.invoiceid)"
-                >
-                  <q-badge
-                    v-if="props.row.unread"
-                    color="red"
-                    rounded
-                    floating
-                    style="padding: 6px; border-radius: 6px"
-                  />
-                </q-btn>
-              </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="shipOrder(props.row.id)"
-                  icon="add_shopping_cart"
-                  color="green"
-                >
-                  <q-tooltip> Product shipped? </q-tooltip>
-                </q-btn>
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deleteOrder(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                ></q-btn>
-              </q-td>
-            </q-tr>
-            <q-tr v-show="props.expand" :props="props">
-              <q-td colspan="100%">
-                <template>
-                  <div class="q-pa-md">
-                    <q-list>
-                      <q-item-label header>Order Details</q-item-label>
-
-                      <q-item v-for="col in props.row.details" :key="col.id">
-                        <q-item-section>
-                          <q-item-label>Products</q-item-label>
-                          <q-item-label caption
-                            >{{ products.length && (_.findWhere(products, {id:
-                            col.product_id})).product }}</q-item-label
-                          >
-                          <q-item-label caption
-                            >Quantity: {{ col.quantity }}</q-item-label
-                          >
-                        </q-item-section>
-                      </q-item>
-
-                      <q-item>
-                        <q-item-section>
-                          <q-item-label>Shipping to</q-item-label>
-                          <q-item-label caption
-                            >{{ props.row.address }}</q-item-label
-                          >
-                        </q-item-section>
-                      </q-item>
-
-                      <q-item>
-                        <q-item-section>
-                          <q-item-label>User info</q-item-label>
-                          <q-item-label caption v-if="props.row.username"
-                            >{{ props.row.username }}</q-item-label
-                          >
-                          <q-item-label caption
-                            >{{ props.row.email }}</q-item-label
-                          >
-                          <q-item-label caption v-if="props.row.pubkey"
-                            >{{ props.row.pubkey }}</q-item-label
-                          >
-                        </q-item-section>
-                      </q-item>
-                      <q-item>
-                        <q-item-section>
-                          <q-item-label>Total</q-item-label>
-                          <q-item-label>{{ props.row.total }}</q-item-label>
-                          <!-- <q-icon name="star" color="yellow" /> -->
-                        </q-item-section>
-                      </q-item>
-                    </q-list>
-                  </div>
-                </template>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-
-    <q-card>
-      <!-- PRODUCTS TABLE -->
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Products</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportProductsCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="products"
-          row-key="id"
-          :columns="productsTable.columns"
-          :pagination.sync="productsTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th auto-width></q-th>
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </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
-                  disabled
-                  unelevated
-                  dense
-                  size="xs"
-                  icon="add_shopping_cart"
-                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  type="a"
-                  :href="props.row.wallet"
-                  target="_blank"
-                ></q-btn>
-                <q-tooltip> Link to pass to stall relay </q-tooltip>
-              </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-              <q-td class="text-center" auto-width>
-                <img
-                  v-if="props.row.image"
-                  :src="props.row.image"
-                  style="height: 1.5em"
-                />
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="openProductUpdateDialog(props.row.id)"
-                  icon="edit"
-                  color="light-blue"
-                ></q-btn>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deleteProduct(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                ></q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-
-    <q-card>
-      <!-- STALLS TABLE -->
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Market Stalls</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportStallsCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="stalls"
-          row-key="id"
-          :columns="stallTable.columns"
-          :pagination.sync="stallTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th auto-width></q-th>
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </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="storefront"
-                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  type="a"
-                  :href="'/shop/stalls/' + props.row.id"
-                  target="_blank"
-                ></q-btn>
-                <q-tooltip> Stall simple UI shopping cart </q-tooltip>
-              </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="openStallUpdateDialog(props.row.id)"
-                  icon="edit"
-                  color="light-blue"
-                ></q-btn>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deleteStall(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                ></q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-
-    <q-card v-if="markets.length">
-      <!-- MARKETPLACES TABLE -->
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Marketplaces</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportStallsCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="markets"
-          row-key="id"
-          :columns="marketTable.columns"
-          :pagination.sync="marketTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th auto-width></q-th>
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </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="storefront"
-                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  type="a"
-                  :href="'/shop/market/' + props.row.id"
-                  target="_blank"
-                ></q-btn>
-                <q-tooltip> Link to pass to stall relay </q-tooltip>
-              </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="openStallUpdateDialog(props.row.id)"
-                  icon="edit"
-                  color="light-blue"
-                ></q-btn>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deleteStall(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                ></q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-
-    <q-card>
-      <!-- ZONES TABLE -->
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Shipping Zones</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportZonesCSV"
-              >Export to CSV</q-btn
-            >
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="zones"
-          row-key="id"
-          :columns="zonesTable.columns"
-          :pagination.sync="zonesTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </q-th>
-              <q-th auto-width></q-th>
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="openZoneUpdateDialog(props.row.id)"
-                  icon="edit"
-                  color="light-blue"
-                ></q-btn>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deleteZone(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                ></q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
+    {% include "shop/_tables.html" %}
     <!-- KEYS -->
     <q-card>
       <q-card-section>
@@ -926,186 +148,8 @@
       </q-card-section>
     </q-card>
     <!-- CHAT BOX -->
-    <q-card>
-      <q-card-section>
-        <h6 class="text-subtitle1 q-my-none">Messages</h6>
-      </q-card-section>
-      <q-card-section class="q-pa-none">
-        <q-separator></q-separator>
-      </q-card-section>
-      <q-card-section>
-        <q-select
-          v-model="customerKey"
-          :options="Object.keys(messages).map(k => ({label: `${k.slice(0, 25)}...`, value: k}))"
-          label="Customers"
-          @input="chatRoom(customerKey)"
-          emit-value
-        ></q-select>
-      </q-card-section>
-      <q-card-section>
-        <div class="chat-container" ref="chatCard">
-          <div class="chat-box">
-            <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
-            <div class="chat-messages">
-              <q-chat-message
-                :key="index"
-                v-for="(message, index) in orderMessages"
-                :name="message.pubkey == keys.pubkey ? 'me' : 'customer'"
-                :text="[message.msg]"
-                :sent="message.pubkey == keys.pubkey ? true : false"
-                :bg-color="message.pubkey == keys.pubkey ? 'white' : 'light-green-2'"
-              />
-            </div>
-          </div>
-          <q-card-section>
-            <q-form @submit="sendMessage" class="full-width chat-input">
-              <q-input
-                ref="newMessage"
-                v-model="newMessage"
-                placeholder="Message"
-                class="full-width"
-                dense
-                outlined
-              >
-                <template>
-                  <q-btn
-                    round
-                    dense
-                    flat
-                    type="submit"
-                    icon="send"
-                    color="primary"
-                  />
-                </template>
-              </q-input>
-            </q-form>
-          </q-card-section>
-        </div>
-      </q-card-section>
-    </q-card>
-    <!-- <q-card>
-      <q-card-section>
-        <h6 class="text-subtitle1 q-my-none">Messages</h6>
-      </q-card-section>
-      <q-card-section class="q-pa-none">
-        <q-separator></q-separator>
-        <div
-          ref="chatCard"
-          class="q-ma-md q-pb-lg"
-          style="height: 350px"
-        >
-          <div class="q-pb-md">
-            <q-select
-              v-model="customerKey"
-              style="width: 80%"
-              :options="Object.keys(messages)"
-              label="Customers"
-              @input="chatRoom(customerKey)"
-            ></q-select>
-            <div class="chat-container q-pa-md"> 
-              <div class="chat-box">
-                <p v-if="Object.keys(messages).length === 0">No messages yet</p>
-                <div class="chat-messages">
-                  <q-chat-message
-                    :key="index"
-                    v-for="(message, index) in orderMessages"
-                    :name="message.pubkey == keys.pubkey ? 'me' : 'customer'"
-                    :text="[message.msg]"
-                    :sent="message.pubkey == keys.pubkey ? true : false"
-                    :bg-color="message.pubkey == keys.pubkey ? 'white' : 'light-green-2'"
-                  />
-                </div>
-              </div>
-              <q-form @submit="sendMessage" class="full-width chat-input">
-                <q-input
-                  ref="newMessage"
-                  v-model="newMessage"
-                  placeholder="Message"
-                  class="full-width"
-                  dense
-                  outlined
-                >
-                  <template>
-                    <q-btn
-                      round
-                      dense
-                      flat
-                      type="submit"
-                      icon="send"
-                      color="primary"
-                    />
-                  </template>
-                </q-input>
-              </q-form>
-            </div>
-          </div>
-          <div class="col-8 q-px-md">
-            <div v-for="message in customerMessages">
-              <q-chat-message
-                v-if="message[0] == 'out'"
-                :text="[message[1]]"
-                sent
-              ></q-chat-message>
-              <q-chat-message v-else :text="[message[1]]"></q-chat-message>
-            </div>
-          </div>
-          <div class="col on-right" style="width: 90%">
-            <q-input>
-              <template v-slot:after>
-                <q-btn round dense flat icon="send" />
-              </template>
-            </q-input>
-          </div>
-        </div>
-      </q-card-section>
-    </q-card> -->
+    {% include "shop/_chat_box.html" %}
   </div>
-  <q-dialog v-model="onboarding.show">
-    <q-card class="q-pa-lg">
-      <h6 class="q-my-md text-primary">How to use Shop</h6>
-      <q-stepper v-model="step" color="primary" vertical animated>
-        <q-step
-          :name="1"
-          title="Create a Shipping Zone"
-          icon="settings"
-          :done="step > 1"
-        >
-          Create Shipping Zones you're willing to ship to. You can define
-          different values for different zones.
-          <q-stepper-navigation>
-            <q-btn @click="step = step + 1" color="primary" label="Next" />
-          </q-stepper-navigation>
-        </q-step>
-        <q-step
-          :name="2"
-          title="Create a Stall"
-          icon="create_new_folder"
-          :done="step > 2"
-        >
-          Create a Stall and provide private and public keys to use for
-          communication. If you don't have one, LNbits will create a key pair
-          for you. It will be saved and can be used on other stalls.
-          <q-stepper-navigation>
-            <q-btn @click="step = step + 1" color="primary" label="Next" />
-          </q-stepper-navigation>
-        </q-step>
-
-        <q-step :name="3" title="Create Products" icon="assignment">
-          Create your products, add a small description and an image. Choose to
-          what stall, if you have more than one, it belongs to
-          <q-stepper-navigation>
-            <q-btn @click="onboarding.finish" color="primary" label="Finish" />
-          </q-stepper-navigation>
-          <div>
-            <q-checkbox
-              v-model="onboarding.showAgain"
-              label="Show this again?"
-            />
-          </div>
-        </q-step>
-      </q-stepper>
-    </q-card>
-  </q-dialog>
 </div>
 
 {% endblock %} {% block scripts %} {{ window_vars(user) }}

From 8037557db68f6bb1754d06972b2dfa2d5f764ed8 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 21 Dec 2022 17:44:37 +0000
Subject: [PATCH 138/174] remove private key everywhere

---
 lnbits/extensions/shop/crud.py       | 4 +---
 lnbits/extensions/shop/migrations.py | 1 -
 lnbits/extensions/shop/models.py     | 2 --
 lnbits/extensions/shop/views.py      | 2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/shop/crud.py
index 43842041..5e35e949 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -148,18 +148,16 @@ async def create_shop_stall(data: createStalls) -> Stalls:
             wallet,
             name,
             publickey,
-            privatekey,
             relays,
             shippingzones
         )
-        VALUES (?, ?, ?, ?, ?, ?, ?)
+        VALUES (?, ?, ?, ?, ?, ?)
         """,
         (
             stall_id,
             data.wallet,
             data.name,
             data.publickey,
-            data.privatekey,
             data.relays,
             data.shippingzones,
         ),
diff --git a/lnbits/extensions/shop/migrations.py b/lnbits/extensions/shop/migrations.py
index fd89d9df..28aaba3e 100644
--- a/lnbits/extensions/shop/migrations.py
+++ b/lnbits/extensions/shop/migrations.py
@@ -9,7 +9,6 @@ async def m001_initial(db):
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
             publickey TEXT,
-            privatekey TEXT,
             relays TEXT,
             shippingzones TEXT NOT NULL,
             rating INTEGER DEFAULT 0
diff --git a/lnbits/extensions/shop/models.py b/lnbits/extensions/shop/models.py
index e3ea2cc6..20ac0a40 100644
--- a/lnbits/extensions/shop/models.py
+++ b/lnbits/extensions/shop/models.py
@@ -9,7 +9,6 @@ class Stalls(BaseModel):
     wallet: str
     name: str
     publickey: Optional[str]
-    privatekey: Optional[str]
     relays: Optional[str]
     shippingzones: str
 
@@ -18,7 +17,6 @@ class createStalls(BaseModel):
     wallet: str = Query(...)
     name: str = Query(...)
     publickey: str = Query(None)
-    privatekey: str = Query(None)
     relays: str = Query(None)
     shippingzones: str = Query(...)
 
diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index f8f44060..48aa126c 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -54,7 +54,7 @@ async def display(request: Request, stall_id):
         )
 
     stall = stall.dict()
-    del stall["privatekey"]
+
     stall["zones"] = zones
 
     return shop_renderer().TemplateResponse(

From 8e337c890e218bcd6364f0c9cb512e0f997fbb4b Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 21 Dec 2022 17:45:44 +0000
Subject: [PATCH 139/174] endpoint to add buyer public key to db

---
 lnbits/extensions/shop/views_api.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index de04a839..408a029d 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -335,6 +335,12 @@ async def api_shop_order_paid(
     return "", HTTPStatus.OK
 
 
+@shop_ext.get("/api/v1/order/pubkey/{payment_hash}/{pubkey}")
+async def api_shop_order_pubkey(payment_hash: str, pubkey: str):
+    await set_shop_order_pubkey(payment_hash, pubkey)
+    return "", HTTPStatus.OK
+
+
 @shop_ext.get("/api/v1/orders/shipped/{order_id}")
 async def api_shop_order_shipped(
     order_id, wallet: WalletTypeInfo = Depends(get_key_type)

From 272e5b6fd0fc8065b8fb82972fea8d23ccc545b3 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 21 Dec 2022 17:46:27 +0000
Subject: [PATCH 140/174] use nostr-tools but nip04 encrypt doesn't work

---
 .../extensions/shop/templates/shop/index.html | 76 +++++++++++++------
 .../extensions/shop/templates/shop/order.html | 25 ++++--
 2 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index e2241e37..7a6a5899 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -88,7 +88,7 @@
 
     {% include "shop/_tables.html" %}
     <!-- KEYS -->
-    <q-card>
+    <q-card v-if="keys">
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -102,7 +102,7 @@
         </div>
       </q-card-section>
       <q-card-section>
-        <div v-if="keys" class="row">
+        <div class="row">
           <div
             class="col-6"
             v-for="type in ['pubkey', 'privkey']"
@@ -155,13 +155,13 @@
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 
 <script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
-<script src="https://github.com/paulmillr/noble-secp256k1/releases/download/1.7.0/noble-secp256k1.js"></script>
+<script src="https://unpkg.com/nostr-tools/lib/nostr.bundle.js"></script>
 
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
 
   const pica = window.pica()
-  const secp = window.nobleSecp256k1
+  const nostr = window.NostrTools
 
   function imgSizeFit(img, maxWidth = 1024, maxHeight = 768) {
     let ratio = Math.min(
@@ -237,7 +237,6 @@
         },
         keys: null,
         diagonAlley: false,
-        diagonalley: false,
         products: [],
         orders: [],
         stalls: [],
@@ -548,14 +547,13 @@
         window.URL.revokeObjectURL(url)
       },
       generateKeys() {
-        const privkey = secp.utils.bytesToHex(secp.utils.randomPrivateKey())
-        const pubkey = secp.utils.bytesToHex(secp.schnorr.getPublicKey(privKey))
+        const privkey = nostr.generatePrivateKey()
+        const pubkey = nostr.getPublicKey(privkey)
 
-        this.keys = {privKey, pubKey}
+        this.keys = {privkey, pubkey}
         this.stallDialog.data.publickey = this.keys.pubkey
         this.stallDialog.data.privatekey = this.keys.privkey
         this.$q.localStorage.set(`lnbits.shop.${this.g.user.id}`, this.keys)
-        console.log({privKey, pubKey})
       },
       restoreKeys() {
         let keys = this.$q.localStorage.getItem(`lnbits.shop.${this.g.user.id}`)
@@ -629,6 +627,10 @@
       openStallDialog: function () {
         this.zoneOptions = humanReadableZones(this.zones)
         this.stallDialog.show = true
+        if (!this.keys && !this.diagonAlley) {
+          this.generateKeys()
+        }
+        console.log(this.stallDialog.data)
       },
       openStallUpdateDialog: function (linkId) {
         var self = this
@@ -652,7 +654,6 @@
           name: this.stallDialog.data.name,
           wallet: this.stallDialog.data.wallet,
           publickey: this.stallDialog.data.publickey,
-          privatekey: this.stallDialog.data.privatekey,
           relays: this.stallDialog.data.relays,
           shippingzones: this.stallDialog.data.shippingzones
             .map(z => z.split('-')[0].trim())
@@ -1104,10 +1105,11 @@
             '/shop/api/v1/orders?all_wallets=true',
             this.g.user.wallets[0].inkey
           )
-          .then(function (response) {
+          .then(response => {
             if (response.data) {
-              self.orders = response.data.map(mapOrders)
+              this.orders = response.data.map(mapOrders)
             }
+            console.log(this.orders)
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
@@ -1193,7 +1195,8 @@
             this.g.user.wallets[0].adminkey
           )
           .then(res => {
-            if (!res.data?.length) return
+            console.log(res)
+            if (!res.data.length) return
             this.messages = _.groupBy(res.data, 'id_conversation')
             this.checkUnreadMessages()
           })
@@ -1203,25 +1206,21 @@
           })
       },
       updateLastSeenMsg(id) {
-        let data = this.$q.localStorage.getItem(`lnbits.shop.${this.g.user.id}`)
+        let data = this.$q.localStorage.getItem(`lnbits.shop.chat`)
         let chat = {
-          ...data.chat,
+          ...data,
           [`${id}`]: {
             timestamp: Object.keys(this.orderMessages)[
               Object.keys(this.orderMessages).length - 1
             ]
           }
         }
-        this.$q.localStorage.set(`lnbits.shop.${this.g.user.id}`, {
-          ...data,
-          chat
-        })
+        this.$q.localStorage.set(`lnbits.shop.chat`, chat)
         this.checkUnreadMessages()
       },
       checkUnreadMessages() {
-        let lastMsgs = this.$q.localStorage.getItem(
-          `lnbits.shop.${this.g.user.id}`
-        ).chat
+        let lastMsgs = this.$q.localStorage.getItem(`lnbits.shop.chat`)
+        if (!lastMsgs) return
         for (let key in this.messages) {
           let idx = this.orders.findIndex(f => f.invoiceid == key)
           if (!lastMsgs[key]) {
@@ -1243,11 +1242,37 @@
         this.newMessage = ''
         this.$refs.newMessage.focus()
       },
-      sendMessage() {
+      async sendMessage() {
+        let orderPublicKey = this.orders.find(
+          o => o.invoiceid == this.customerKey
+        ).pubkey
+        let ciphertext = nostr.nip04.encrypt(
+          this.keys.privkey,
+          orderPublicKey,
+          this.newMessage
+        )
+
         let message = {
-          msg: this.newMessage,
-          pubkey: this.keys.pubkey
+          msg: ciphertext,
+          pubkey: this.keys.publickey
         }
+
+        // if diagon alley mode is active create a propper event
+        /*
+        if (this.diagonAlley) {
+          let event = {
+            kind: 4,
+            pubkey: this.keys.publickey,
+            tags: [['p', orderPublicKey]],
+            content: ciphertext,
+            created_at: Math.floor(Date.now() / 1000)
+          }
+
+          event.id = nostr.getEventHash(event)
+          event.sig = await nostr.signEvent(event, this.keys.privatekey)
+        }
+        */
+
         this.ws.send(JSON.stringify(message))
 
         this.clearMessage()
@@ -1322,6 +1347,7 @@
         }
         setInterval(() => {
           this.getAllMessages()
+          this.getOrders()
         }, 300000)
       }
     }
diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index 717e4154..dc5a3c51 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -243,7 +243,7 @@
   </q-dialog>
 </div>
 {% endblock %} {% block scripts %}
-<script src="https://github.com/paulmillr/noble-secp256k1/releases/download/1.7.0/noble-secp256k1.js"></script>
+<script src="https://unpkg.com/nostr-tools/lib/nostr.bundle.js"></script>
 
 <script>
   const mapChatMsg = msg => {
@@ -255,7 +255,7 @@
     return obj
   }
   Vue.component(VueQrcode.name, VueQrcode)
-  const secp = window.nobleSecp256k1
+  const nostr = window.NostrTools
   new Vue({
     el: '#vue',
     mixins: [windowMixin],
@@ -350,10 +350,15 @@
         if ('publickey' in this.user.keys && 'privatekey' in this.user.keys)
           return
 
-        const privkey = secp.utils.bytesToHex(secp.utils.randomPrivateKey())
-        const pubkey = secp.utils.bytesToHex(secp.schnorr.getPublicKey(privKey))
+        const privkey = nostr.generatePrivateKey()
+        const pubkey = nostr.getPublicKey(privkey)
 
-        this.user.keys = {privatekey: privkey, publickey: pubkey}
+        this.user = {
+          keys: {
+            privatekey: privkey,
+            publickey: pubkey
+          }
+        }
       },
       async getMessages(room_name, all = false) {
         await LNbits.api
@@ -413,7 +418,6 @@
       }
     },
     async created() {
-      console.log('{{request.url}}')
       let order_details = JSON.parse('{{ order | tojson }}')
       let products = JSON.parse('{{ products | tojson }}')
       let order_id = '{{ order_id }}'
@@ -444,13 +448,20 @@
 
       if (data) {
         this.user = data
-        //add chat key (merchant pubkey) if not set
         if (!this.user.orders[`${order_id}`]) {
           this.$set(this.user.orders, order_id, this.products)
         }
       } else {
         // generate keys
         this.generateKeys()
+        try {
+          await LNbits.api.request(
+            'GET',
+            `/shop/api/v1/order/pubkey/${order_id}/${this.user.keys.publickey}`
+          )
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
+        }
         // populate user data
         this.user.orders = {
           [`${order_id}`]: this.products

From c9c7ad90ab321c1651d6ec6be9e4668cd81a1a6d Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 21 Dec 2022 17:47:00 +0000
Subject: [PATCH 141/174] remove view details from product card

---
 lnbits/extensions/shop/templates/shop/stall.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index 70a030ac..6e776e86 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -137,7 +137,7 @@
         </div>
       </q-card-section>
 
-      <q-separator></q-separator>
+      <!-- <q-separator></q-separator>
 
       <q-card-actions>
         <q-btn
@@ -148,7 +148,7 @@
         >
           View details
         </q-btn>
-      </q-card-actions>
+      </q-card-actions> -->
       {% endraw %}
     </q-card>
   </div>

From b59fa77dbd12d0c0d9fb943293c9538e36fc7467 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 21 Dec 2022 17:47:15 +0000
Subject: [PATCH 142/174] some formatting

---
 lnbits/extensions/shop/templates/shop/_dialogs.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/_dialogs.html b/lnbits/extensions/shop/templates/shop/_dialogs.html
index 600897b6..779af035 100644
--- a/lnbits/extensions/shop/templates/shop/_dialogs.html
+++ b/lnbits/extensions/shop/templates/shop/_dialogs.html
@@ -250,7 +250,7 @@
       >
       </q-select>
       <q-input
-        v-if="diagonalley"
+        v-if="diagonAlley"
         v-if="keys"
         filled
         dense
@@ -258,7 +258,7 @@
         label="Public Key"
       ></q-input>
       <q-input
-        v-if="diagonalley"
+        v-if="diagonAlley"
         v-if="keys"
         filled
         dense
@@ -266,7 +266,7 @@
         label="Private Key"
       ></q-input>
       <!-- NOSTR -->
-      <div v-if="diagonalley" class="row">
+      <div v-if="diagonAlley" class="row">
         <div class="col-5">
           <q-btn unelevated @click="generateKeys" color="primary"
             >Generate keys</q-btn
@@ -287,7 +287,7 @@
         label="Shipping Zones"
       ></q-select>
       <q-select
-        v-if="diagonalley"
+        v-if="diagonAlley"
         :options="relayOptions"
         filled
         dense
@@ -296,14 +296,14 @@
         label="Relays"
       ></q-select>
       <q-input
-        v-if="diagonalley"
+        v-if="diagonAlley"
         filled
         dense
         v-model.trim="stallDialog.data.crelays"
         label="Custom relays (seperate by comma)"
       ></q-input>
       <q-input
-        v-if="diagonalley"
+        v-if="diagonAlley"
         filled
         dense
         v-model.trim="stallDialog.data.nostrShops"

From 10a1a28d0430d795115e4cd0e5a658b80f1f5f0b Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 21 Dec 2022 18:35:53 +0000
Subject: [PATCH 143/174] make chat work again + some weird formatting... again

---
 .../extensions/shop/templates/shop/index.html  | 18 +++++++++++-------
 .../extensions/shop/templates/shop/order.html  |  5 +++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 7a6a5899..9bc135e6 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -1242,19 +1242,22 @@
         this.newMessage = ''
         this.$refs.newMessage.focus()
       },
-      async sendMessage() {
-        let orderPublicKey = this.orders.find(
+      sendMessage() {
+        // we need Buffer to make this play nice
+
+        /*let orderPublicKey = this.orders.find(
           o => o.invoiceid == this.customerKey
-        ).pubkey
-        let ciphertext = nostr.nip04.encrypt(
+        ).pubkey*/
+
+        /*let ciphertext = nostr.nip04.encrypt(
           this.keys.privkey,
           orderPublicKey,
           this.newMessage
-        )
+        )*/
 
         let message = {
-          msg: ciphertext,
-          pubkey: this.keys.publickey
+          msg: this.newMessage,
+          pubkey: this.keys.pubkey
         }
 
         // if diagon alley mode is active create a propper event
@@ -1373,6 +1376,7 @@
     padding: 1rem;
     overflow-y: auto;
     margin-left: auto;
+    width: 50%;
   }
 
   .chat-messages {
diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index dc5a3c51..ab633b54 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -2,7 +2,7 @@
 <div class="row q-col-gutter-md flex">
   <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
     <q-card>
-      <div class="chat-container">
+      <div class="chat-container q-pa-md">
         <div class="chat-box">
           <!-- <p v-if="Object.keys(messages).length === 0">No messages yet</p> -->
           <div class="chat-messages">
@@ -489,7 +489,7 @@
     display: grid;
     grid-template-rows: 1fr auto;
     /*height: calc(100vh - 200px);*/
-    height: 50vh;
+    height: 70vh;
   }
 
   .chat-box {
@@ -498,6 +498,7 @@
     padding: 1rem;
     overflow-y: auto;
     margin-left: auto;
+    width: 50%;
   }
 
   .chat-messages {

From b179b48edc9a7f54ce717f058569c3bfe6f18376 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 10:44:10 +0000
Subject: [PATCH 144/174] message notification

---
 .../extensions/shop/templates/shop/index.html | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 9bc135e6..1a1954eb 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -630,7 +630,6 @@
         if (!this.keys && !this.diagonAlley) {
           this.generateKeys()
         }
-        console.log(this.stallDialog.data)
       },
       openStallUpdateDialog: function (linkId) {
         var self = this
@@ -653,7 +652,7 @@
         let data = {
           name: this.stallDialog.data.name,
           wallet: this.stallDialog.data.wallet,
-          publickey: this.stallDialog.data.publickey,
+          publickey: this.stallDialog.data.publickey || this.keys.pubkey,
           relays: this.stallDialog.data.relays,
           shippingzones: this.stallDialog.data.shippingzones
             .map(z => z.split('-')[0].trim())
@@ -1109,7 +1108,6 @@
             if (response.data) {
               this.orders = response.data.map(mapOrders)
             }
-            console.log(this.orders)
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
@@ -1195,7 +1193,6 @@
             this.g.user.wallets[0].adminkey
           )
           .then(res => {
-            console.log(res)
             if (!res.data.length) return
             this.messages = _.groupBy(res.data, 'id_conversation')
             this.checkUnreadMessages()
@@ -1219,15 +1216,15 @@
         this.checkUnreadMessages()
       },
       checkUnreadMessages() {
-        let lastMsgs = this.$q.localStorage.getItem(`lnbits.shop.chat`)
-        if (!lastMsgs) return
+        let lastMsgs = this.$q.localStorage.getItem(`lnbits.shop.chat`) || {}
+
         for (let key in this.messages) {
           let idx = this.orders.findIndex(f => f.invoiceid == key)
           if (!lastMsgs[key]) {
             this.updateLastSeenMsg(key)
+            this.$set(this.orders[idx], 'unread', true)
             return
           }
-
           if (
             lastMsgs[key].timestamp <
             Math.max(...this.messages[key].map(c => c.timestamp))
@@ -1242,24 +1239,22 @@
         this.newMessage = ''
         this.$refs.newMessage.focus()
       },
-      sendMessage() {
-        // we need Buffer to make this play nice
-
-        /*let orderPublicKey = this.orders.find(
+      async sendMessage() {
+        // this is way more tricky...
+        // need to figure out how to better display our messages in plain text, and incoming with encryption
+        // also, as we're saving messages to the DB, the full Nostr event format will be much more heavy in size
+        /*
+        let orderPublicKey = this.orders.find(
           o => o.invoiceid == this.customerKey
-        ).pubkey*/
+        ).pubkey
 
-        /*let ciphertext = nostr.nip04.encrypt(
+        let ciphertext = await nostr.nip04.encrypt(
           this.keys.privkey,
           orderPublicKey,
           this.newMessage
-        )*/
-
-        let message = {
-          msg: this.newMessage,
-          pubkey: this.keys.pubkey
-        }
+        )
 
+        */
         // if diagon alley mode is active create a propper event
         /*
         if (this.diagonAlley) {
@@ -1276,6 +1271,11 @@
         }
         */
 
+        let message = {
+          msg: this.newMessage,
+          pubkey: this.keys.pubkey
+        }
+
         this.ws.send(JSON.stringify(message))
 
         this.clearMessage()
@@ -1289,6 +1289,7 @@
             pubkey: m.pubkey
           })
         })
+        this.customerKey = id
         this.$refs.chatCard.scrollIntoView({
           behavior: 'smooth',
           inline: 'nearest'
@@ -1317,7 +1318,7 @@
           }
         }
 
-        ws.onmessage = event => {
+        ws.onmessage = async event => {
           let event_data = JSON.parse(event.data)
 
           this.$set(this.orderMessages, Date.now(), event_data)

From 952677ae138dc312241210eacd63fc71e9a55097 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 10:44:56 +0000
Subject: [PATCH 145/174] refactor keys

---
 lnbits/extensions/shop/templates/shop/order.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index ab633b54..7fd81747 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -270,7 +270,8 @@
         products: [],
         orders: [],
         user: {
-          keys: {}
+          keys: {},
+          orders: {}
         },
         keysDialog: {
           show: false,
@@ -353,11 +354,9 @@
         const privkey = nostr.generatePrivateKey()
         const pubkey = nostr.getPublicKey(privkey)
 
-        this.user = {
-          keys: {
-            privatekey: privkey,
-            publickey: pubkey
-          }
+        this.user.keys = {
+          privatekey: privkey,
+          publickey: pubkey
         }
       },
       async getMessages(room_name, all = false) {

From 2a078651b9d398ca9dde31c33ee291fcd3ac1c0a Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 10:45:18 +0000
Subject: [PATCH 146/174] add product button to table

---
 lnbits/extensions/shop/templates/shop/_tables.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lnbits/extensions/shop/templates/shop/_tables.html b/lnbits/extensions/shop/templates/shop/_tables.html
index 9b731c20..3cf66f62 100644
--- a/lnbits/extensions/shop/templates/shop/_tables.html
+++ b/lnbits/extensions/shop/templates/shop/_tables.html
@@ -148,7 +148,19 @@
   <q-card-section>
     <div class="row items-center no-wrap q-mb-md">
       <div class="col">
-        <h5 class="text-subtitle1 q-my-none">Products</h5>
+        <h5 class="text-subtitle1 q-my-none">
+          Products
+          <span v-if="stalls.length > 0" class="q-px-sm">
+            <q-btn
+              round
+              color="primary"
+              icon="add"
+              size="sm"
+              @click="productDialog.show = true"
+            />
+            <q-tooltip> Add a product </q-tooltip>
+          </span>
+        </h5>
       </div>
       <div class="col-auto">
         <q-btn flat color="grey" @click="exportProductsCSV"

From 119195749514144ddc59a6fdbb50ba7832f79329 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 10:45:34 +0000
Subject: [PATCH 147/174] clean up prints

---
 lnbits/extensions/shop/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index 48aa126c..776246e9 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -183,7 +183,6 @@ async def websocket_endpoint(
             if websocket not in room_members:
                 print("Sender not in room member: Reconnecting...")
                 await notifier.connect(websocket, room_name)
-            print("ENDPOINT", data)
             await notifier._notify(data, room_name)
 
     except WebSocketDisconnect:

From 270712e07db15477f58780c1dc94509e0d669ef8 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 10:45:56 +0000
Subject: [PATCH 148/174] DROP CaSCADE for deleting shops

---
 lnbits/extensions/shop/migrations.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/shop/migrations.py b/lnbits/extensions/shop/migrations.py
index 28aaba3e..a99eab68 100644
--- a/lnbits/extensions/shop/migrations.py
+++ b/lnbits/extensions/shop/migrations.py
@@ -23,7 +23,7 @@ async def m001_initial(db):
         f"""
         CREATE TABLE shop.products (
             id TEXT PRIMARY KEY,
-            stall TEXT NOT NULL REFERENCES {db.references_schema}stalls (id),
+            stall TEXT NOT NULL REFERENCES {db.references_schema}stalls (id) ON DELETE CASCADE,
             product TEXT NOT NULL,
             categories TEXT,
             description TEXT,
@@ -80,8 +80,8 @@ async def m001_initial(db):
         f"""
         CREATE TABLE shop.order_details (
             id TEXT PRIMARY KEY,
-            order_id INTEGER NOT NULL REFERENCES {db.references_schema}orders (id),
-            product_id TEXT NOT NULL REFERENCES {db.references_schema}products (id),
+            order_id INTEGER NOT NULL REFERENCES {db.references_schema}orders (id) ON DELETE CASCADE,
+            product_id TEXT NOT NULL REFERENCES {db.references_schema}products (id) ON DELETE CASCADE,
             quantity INTEGER NOT NULL
         );
     """
@@ -107,14 +107,12 @@ async def m001_initial(db):
         f"""
         CREATE TABLE shop.market_stalls (
             id TEXT PRIMARY KEY,
-            marketid TEXT NOT NULL REFERENCES {db.references_schema}markets (id),
-            stallid TEXT NOT NULL REFERENCES {db.references_schema}stalls (id)
+            marketid TEXT NOT NULL REFERENCES {db.references_schema}markets (id) ON DELETE CASCADE,
+            stallid TEXT NOT NULL REFERENCES {db.references_schema}stalls (id) ON DELETE CASCADE
         );
     """
     )
 
-
-async def m002_add_chat_messages(db):
     """
     Initial chat messages table.
     """

From 4ad7d915e5af4a8b11611fb0a0ec5382e1ab3ca5 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 11:03:23 +0000
Subject: [PATCH 149/174] checkwebsocket function

---
 .../shop/templates/shop/_chat_box.html        |  1 +
 .../extensions/shop/templates/shop/index.html | 18 +++++++++---------
 .../extensions/shop/templates/shop/order.html | 19 ++++++++++---------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/_chat_box.html b/lnbits/extensions/shop/templates/shop/_chat_box.html
index 87755e41..05b0c58f 100644
--- a/lnbits/extensions/shop/templates/shop/_chat_box.html
+++ b/lnbits/extensions/shop/templates/shop/_chat_box.html
@@ -38,6 +38,7 @@
             class="full-width"
             dense
             outlined
+            @click="checkWebSocket"
           >
             <template>
               <q-btn
diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 1a1954eb..f0fc79f9 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -1280,6 +1280,15 @@
 
         this.clearMessage()
       },
+      checkWebSocket() {
+        if (!this.ws) return
+        if (this.ws.readyState === WebSocket.CLOSED) {
+          console.log('WebSocket CLOSED: Reopening')
+          this.ws = new WebSocket(
+            ws_scheme + location.host + '/shop/ws/' + this.customerKey
+          )
+        }
+      },
       chatRoom(id) {
         this.startChat(id)
         this.orderMessages = {}
@@ -1309,15 +1318,6 @@
         }
         ws = new WebSocket(ws_scheme + location.host + '/shop/ws/' + room_name)
 
-        function checkWebSocket(event) {
-          if (ws.readyState === WebSocket.CLOSED) {
-            console.log('WebSocket CLOSED: Reopening')
-            ws = new WebSocket(
-              ws_scheme + location.host + '/shop/ws/' + room_name
-            )
-          }
-        }
-
         ws.onmessage = async event => {
           let event_data = JSON.parse(event.data)
 
diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index 7fd81747..de4a109c 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -24,6 +24,7 @@
             class="full-width"
             dense
             outlined
+            @click="checkWebSocket"
           >
             <template>
               <q-btn
@@ -387,6 +388,15 @@
         await this.getMessages(this.selectedOrder)
         this.startChat(this.selectedOrder)
       },
+      checkWebSocket() {
+        if (!this.ws) return
+        if (this.ws.readyState === WebSocket.CLOSED) {
+          console.log('WebSocket CLOSED: Reopening')
+          this.ws = new WebSocket(
+            ws_scheme + location.host + '/shop/ws/' + this.selectedOrder
+          )
+        }
+      },
       startChat(room_name) {
         if (this.ws) {
           this.ws.close()
@@ -398,15 +408,6 @@
         }
         ws = new WebSocket(ws_scheme + location.host + '/shop/ws/' + room_name)
 
-        function checkWebSocket(event) {
-          if (ws.readyState === WebSocket.CLOSED) {
-            console.log('WebSocket CLOSED: Reopening')
-            ws = new WebSocket(
-              ws_scheme + location.host + '/shop/ws/' + room_name
-            )
-          }
-        }
-
         ws.onmessage = event => {
           let event_data = JSON.parse(event.data)
 

From 293edd0d6be4fab682c4e9edbfcd953c7fc34c46 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 12:07:38 +0000
Subject: [PATCH 150/174] bring key backup and add bookmark dialog

---
 .../shop/templates/shop/_dialogs.html         |  1 +
 .../extensions/shop/templates/shop/order.html | 38 ++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/_dialogs.html b/lnbits/extensions/shop/templates/shop/_dialogs.html
index 779af035..a55d7614 100644
--- a/lnbits/extensions/shop/templates/shop/_dialogs.html
+++ b/lnbits/extensions/shop/templates/shop/_dialogs.html
@@ -339,6 +339,7 @@
     </q-form>
   </q-card>
 </q-dialog>
+<!-- ONBOARDING DIALOG -->
 <q-dialog v-model="onboarding.show">
   <q-card class="q-pa-lg">
     <h6 class="q-my-md text-primary">How to use Shop</h6>
diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index de4a109c..0df0acb3 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -103,11 +103,7 @@
       <q-card-section>
         <q-separator></q-separator>
         <q-list>
-          <q-expansion-item
-            v-if="diagonalley"
-            group="extras"
-            icon="vpn_key"
-            label="Keys"
+          <q-expansion-item group="extras" icon="vpn_key" label="Keys"
             ><p>
               Bellow are the keys needed to contact the merchant. They are
               stored in the browser!
@@ -242,6 +238,28 @@
       </q-form>
     </q-card>
   </q-dialog>
+  <!-- ONBOARDING DIALOG -->
+  <q-dialog v-model="lnbitsBookmark.show">
+    <q-card class="q-pa-lg">
+      <h6 class="q-my-md text-primary">Bookmark this page</h6>
+      <p>
+        Don't forget to bookmark this page to be able to check on your order!
+      </p>
+      <p>
+        You can backup your keys, and export the page to another device also.
+      </p>
+      <div class="row q-mt-lg">
+        <q-btn
+          v-close-popup
+          flat
+          @click="lnbitsBookmark.finish"
+          color="grey"
+          class="q-ml-auto"
+          >Close</q-btn
+        >
+      </div>
+    </q-card>
+  </q-dialog>
 </div>
 {% endblock %} {% block scripts %}
 <script src="https://unpkg.com/nostr-tools/lib/nostr.bundle.js"></script>
@@ -262,6 +280,13 @@
     mixins: [windowMixin],
     data: function () {
       return {
+        lnbitsBookmark: {
+          show: true,
+          finish: () => {
+            this.$q.localStorage.set('lnbits.shopbookmark', false)
+            this.lnbitsBookmark.show = false
+          }
+        },
         newMessage: '',
         showMessages: false,
         messages: {},
@@ -418,6 +443,9 @@
       }
     },
     async created() {
+      let showBookmark = this.$q.localStorage.getItem('lnbits.shopbookmark')
+      this.lnbitsBookmark.show = showBookmark === true || showBookmark == null
+
       let order_details = JSON.parse('{{ order | tojson }}')
       let products = JSON.parse('{{ products | tojson }}')
       let order_id = '{{ order_id }}'

From cdb5e8176d21b3c2296f86153af07edf71c78c18 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 12:13:25 +0000
Subject: [PATCH 151/174] more cleanup

---
 .../extensions/shop/templates/shop/index.html | 10 ---
 lnbits/extensions/shop/views_api.py           | 62 ++-----------------
 2 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index f0fc79f9..04833e5f 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -595,16 +595,6 @@
         })
       },
       ////////////////////////////////////////
-      ///////////SUPPORT MESSAGES/////////////
-      ////////////////////////////////////////
-      getMessages: function (customerKey) {
-        var self = this
-        messages = []
-        messages.push(['in', 'blah blah'])
-        messages.push(['out', 'blah blah'])
-        self.customerMessages = messages
-      },
-      ////////////////////////////////////////
       ////////////////STALLS//////////////////
       ////////////////////////////////////////
       getStalls: function () {
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index 408a029d..9c852a2b 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -75,7 +75,7 @@ from .models import (
 ### Products
 @shop_ext.get("/api/v1/products")
 async def api_shop_products(
-    wallet: WalletTypeInfo = Depends(get_key_type),
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
     all_stalls: bool = Query(False),
 ):
     wallet_ids = [wallet.wallet.id]
@@ -94,7 +94,9 @@ async def api_shop_products(
 @shop_ext.post("/api/v1/products")
 @shop_ext.put("/api/v1/products/{product_id}")
 async def api_shop_product_create(
-    data: createProduct, product_id=None, wallet: WalletTypeInfo = Depends(get_key_type)
+    data: createProduct,
+    product_id=None,
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
 
     if product_id:
@@ -389,49 +391,6 @@ async def api_shop_stall_checkshipped(
     return {"shipped": rows["shipped"]}
 
 
-###Place order
-
-
-# @shop_ext.post("/api/v1/stall/order/{stall_id}")
-# async def api_shop_stall_order(
-#     stall_id, data: createOrder, wallet: WalletTypeInfo = Depends(get_key_type)
-# ):
-#     product = await get_shop_product(data.productid)
-#     shipping = await get_shop_stall(stall_id)
-
-#     if data.shippingzone == 1:
-#         shippingcost = shipping.zone1cost  # missing in model
-#     else:
-#         shippingcost = shipping.zone2cost  # missing in model
-
-#     checking_id, payment_request = await create_invoice(
-#         wallet_id=product.wallet,
-#         amount=shippingcost + (data.quantity * product.price),
-#         memo=shipping.wallet,
-#     )
-#     selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
-#     await db.execute(
-#         """
-#             INSERT INTO shop.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
-#             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-#             """,
-#         (
-#             selling_id,
-#             data.productid,
-#             product.wallet,  # doesn't exist in model
-#             product.product,
-#             data.quantity,
-#             data.shippingzone,
-#             data.address,
-#             data.email,
-#             checking_id,
-#             False,
-#             False,
-#         ),
-#     )
-#     return {"checking_id": checking_id, "payment_request": payment_request}
-
-
 ##
 # MARKETS
 ##
@@ -475,19 +434,6 @@ async def api_shop_stall_create(
     return market.dict()
 
 
-## KEYS
-
-
-@shop_ext.get("/api/v1/keys")
-async def api_shop_generate_keys():
-    private_key = PrivateKey()
-    public_key = private_key.pubkey.serialize().hex()
-    while not public_key.startswith("02"):
-        private_key = PrivateKey()
-        public_key = private_key.pubkey.serialize().hex()
-    return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}
-
-
 ## MESSAGES/CHAT
 
 

From ef73f3ca75a9af66b29dc22f20e0940560336d7b Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 12:23:22 +0000
Subject: [PATCH 152/174] fix some bugs and format

---
 lnbits/extensions/shop/crud.py      | 2 +-
 lnbits/extensions/shop/views.py     | 6 +++---
 lnbits/extensions/shop/views_api.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/shop/crud.py
index 5e35e949..8ddd0a53 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -52,7 +52,7 @@ async def create_shop_product(data: createProduct) -> Products:
     return product
 
 
-async def update_shop_product(product_id: str, **kwargs) -> Optional[Stalls]:
+async def update_shop_product(product_id: str, **kwargs) -> Optional[Products]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
 
     await db.execute(
diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index 776246e9..1a2c07f9 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -39,7 +39,7 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 
 @shop_ext.get("/stalls/{stall_id}", response_class=HTMLResponse)
-async def display(request: Request, stall_id):
+async def stall(request: Request, stall_id):
     stall = await get_shop_stall(stall_id)
     products = await get_shop_products(stall_id)
     zones = []
@@ -68,7 +68,7 @@ async def display(request: Request, stall_id):
 
 
 @shop_ext.get("/market/{market_id}", response_class=HTMLResponse)
-async def display(request: Request, market_id):
+async def market(request: Request, market_id):
     market = await get_shop_market(market_id)
 
     if not market:
@@ -92,7 +92,7 @@ async def display(request: Request, market_id):
 
 
 @shop_ext.get("/order", response_class=HTMLResponse)
-async def chat_page(
+async def order_chat(
     request: Request,
     merch: str = Query(...),
     invoice_id: str = Query(...),
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index 9c852a2b..d9f0c80b 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -19,8 +19,8 @@ from lnbits.decorators import (
     require_admin_key,
     require_invoice_key,
 )
+from lnbits.helpers import urlsafe_short_hash
 
-from ...helpers import urlsafe_short_hash
 from . import db, shop_ext
 from .crud import (
     create_shop_market,

From c412371ee64f266bbb706261b1a12d9230f50f00 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 12:33:15 +0000
Subject: [PATCH 153/174] cleanup

---
 lnbits/extensions/shop/views.py | 35 ---------------------------------
 1 file changed, 35 deletions(-)

diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index 1a2c07f9..d9fbe64b 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -128,41 +128,6 @@ async def order_chat(
 notifier = Notifier()
 
 
-# class ConnectionManager:
-#     def __init__(self):
-#         self.active_connections: List[WebSocket] = []
-
-#     async def connect(self, websocket: WebSocket, room_name: str):
-#         await websocket.accept()
-#         websocket.id = room_name
-#         self.active_connections.append(websocket)
-
-#     def disconnect(self, websocket: WebSocket):
-#         self.active_connections.remove(websocket)
-
-#     async def send_personal_message(self, message: str, room_name: str):
-#         for connection in self.active_connections:
-#             if connection.id == room_name:
-#                 await connection.send_text(message)
-
-#     async def broadcast(self, message: str):
-#         for connection in self.active_connections:
-#             await connection.send_text(message)
-
-
-# manager = ConnectionManager()
-
-
-# @shop_ext.websocket("/ws/{room_name}")
-# async def websocket_endpoint(websocket: WebSocket, room_name: str):
-#     await manager.connect(websocket, room_name)
-#     try:
-#         while True:
-#             data = await websocket.receive_text()
-#     except WebSocketDisconnect:
-#         manager.disconnect(websocket)
-
-
 @shop_ext.websocket("/ws/{room_name}")
 async def websocket_endpoint(
     websocket: WebSocket, room_name: str, background_tasks: BackgroundTasks

From b1473fc1a4449661b5f00a76a5d33976f2f2d7a5 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 22 Dec 2022 18:26:34 +0000
Subject: [PATCH 154/174] add currency option

---
 lnbits/extensions/shop/crud.py                | 22 ++++++++
 lnbits/extensions/shop/migrations.py          | 13 +++++
 lnbits/extensions/shop/models.py              | 11 ++++
 .../extensions/shop/templates/shop/index.html | 52 ++++++++++++++++++-
 lnbits/extensions/shop/views_api.py           | 26 ++++++++++
 5 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/shop/crud.py
index 8ddd0a53..1986829e 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -9,6 +9,7 @@ from lnbits.settings import WALLET
 
 from . import db
 from .models import (
+    ShopSettings,
     ChatMessage,
     CreateChatMessage,
     CreateMarket,
@@ -443,3 +444,24 @@ async def get_shop_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
         (*ids,),
     )
     return [ChatMessage(**row) for row in rows]
+
+
+async def get_shop_settings(user) -> Optional[ShopSettings]:
+    row = await db.fetchone("SELECT * FROM shop.settings WHERE 'user = ?", (user,))
+
+    return ShopSettings(**row) if row else None
+
+
+async def set_shop_settings(user: str, data) -> Optional[ShopSettings]:
+    await db.execute(
+        f"""
+            UPDATE shop.settings
+            SET currency = ?, fiat_base_multiplier = ?
+            WHERE 'user' = ?;
+        """,
+        (
+            data.currency,
+            data.fiat_base_multiplier,
+            user,
+        ),
+    )
diff --git a/lnbits/extensions/shop/migrations.py b/lnbits/extensions/shop/migrations.py
index a99eab68..2936695e 100644
--- a/lnbits/extensions/shop/migrations.py
+++ b/lnbits/extensions/shop/migrations.py
@@ -1,4 +1,17 @@
 async def m001_initial(db):
+    """
+    Initial Shop settings table.
+    """
+    await db.execute(
+        """
+        CREATE TABLE shop.settings (
+            "user" TEXT PRIMARY KEY,
+            currency TEXT DEFAULT 'sat',
+            fiat_base_multiplier INTEGER DEFAULT 1
+        );
+    """
+    )
+
     """
     Initial stalls table.
     """
diff --git a/lnbits/extensions/shop/models.py b/lnbits/extensions/shop/models.py
index 20ac0a40..2282cef0 100644
--- a/lnbits/extensions/shop/models.py
+++ b/lnbits/extensions/shop/models.py
@@ -4,6 +4,17 @@ from fastapi.param_functions import Query
 from pydantic import BaseModel
 
 
+class ShopSettings(BaseModel):
+    user: str
+    currency: str
+    fiat_base_multiplier: int
+
+
+class SetSettings(BaseModel):
+    currency: str
+    fiat_base_multiplier: int = Query(100, ge=1)
+
+
 class Stalls(BaseModel):
     id: str
     wallet: str
diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 04833e5f..d546ce47 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -4,7 +4,7 @@
   {% include "shop/_dialogs.html" %}
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
-      <q-card-section>
+      <q-card-section class="q-gutter-sm row">
         <q-btn unelevated color="primary" @click="zoneDialog.show = true"
           >+ Shipping Zone<q-tooltip> Create a shipping zone </q-tooltip></q-btn
         >
@@ -42,8 +42,18 @@
           @click="errorMessage('First set shipping zone(s), then create a stall.')"
           >+ Product <q-tooltip> List a product </q-tooltip></q-btn
         >
+        <q-select
+          style="width: 100px"
+          filled
+          dense
+          v-model="currencies.unit"
+          type="text"
+          label="Unit"
+          :options="currencies.units"
+          @input="(value) => setCurrency(value)"
+        ></q-select>
         <q-btn
-          class="float-right"
+          class="q-ml-auto"
           unelevated
           flat
           color="primary"
@@ -237,6 +247,10 @@
         },
         keys: null,
         diagonAlley: false,
+        currencies: {
+          units: ['sat'],
+          unit: 'sat'
+        },
         products: [],
         orders: [],
         stalls: [],
@@ -523,6 +537,29 @@
       toggleDA(value, evt) {
         this.$q.localStorage.set(`lnbits.DAmode`, value)
       },
+      setCurrency(v) {
+        let data = {
+          currency: v,
+          fiat_base_multiplier: this.currencies.unit != 'sat' ? 100 : 1
+        }
+        LNbits.api
+          .request(
+            'PUT',
+            '/shop/api/v1/settings',
+            this.g.user.wallets[0].adminkey,
+            data
+          )
+          .then(response => {
+            this.$q.notify({
+              type: 'positive',
+              message: `Currency changed`,
+              icon: 'check'
+            })
+          })
+          .catch(error => {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
       shopDataDownload() {
         const removeClone = obj => {
           delete obj._data
@@ -1320,6 +1357,16 @@
         }
 
         this.ws = ws
+      },
+      async getCurrencies() {
+        await LNbits.api
+          .request('GET', '/shop/api/v1/currencies')
+          .then(response => {
+            this.currencies.units = ['sat', ...response.data]
+          })
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+          })
       }
     },
     async created() {
@@ -1329,6 +1376,7 @@
         this.onboarding.showAgain = showOnboard || false
         this.diagonAlley =
           this.$q.localStorage.getItem('lnbits.DAmode') || false
+        await this.getCurrencies()
         this.getStalls()
         this.getProducts()
         this.getZones()
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index d9f0c80b..86f0a8f5 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -9,6 +9,7 @@ from fastapi.params import Depends
 from loguru import logger
 from secp256k1 import PrivateKey, PublicKey
 from starlette.exceptions import HTTPException
+from lnbits.utils.exchange_rates import currencies, get_fiat_rate_satoshis
 
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
@@ -23,6 +24,8 @@ from lnbits.helpers import urlsafe_short_hash
 
 from . import db, shop_ext
 from .crud import (
+    set_shop_settings,
+    get_shop_settings,
     create_shop_market,
     create_shop_market_stalls,
     create_shop_order,
@@ -58,6 +61,7 @@ from .crud import (
     update_shop_zone,
 )
 from .models import (
+    SetSettings,
     CreateMarket,
     Orders,
     Products,
@@ -452,3 +456,25 @@ async def api_get_latest_chat_msg(room_name: str, all_messages: bool = Query(Fal
         messages = await get_shop_latest_chat_messages(room_name)
 
     return messages
+
+
+@shop_ext.get("/api/v1/currencies")
+async def api_list_currencies_available():
+    return list(currencies.keys())
+
+
+@shop_ext.get("/api/v1/settings")
+async def api_get_settings(wallet: WalletTypeInfo = Depends(require_admin_key)):
+    user = wallet.wallet.user
+
+    settings = await get_shop_settings(user)
+
+    return settings
+
+
+@shop_ext.put("/api/v1/settings")
+async def api_set_settings(
+    data: SetSettings, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
+    user = wallet.wallet.user
+    return await set_shop_settings(user, data)

From 11b015e516648d6773e2567b53ec01ac06101808 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 27 Dec 2022 11:12:29 +0000
Subject: [PATCH 155/174] add currency to stalls show products in fiat

---
 lnbits/extensions/shop/crud.py                | 26 ++++++--
 lnbits/extensions/shop/migrations.py          |  1 +
 lnbits/extensions/shop/models.py              | 10 +--
 .../shop/templates/shop/_dialogs.html         | 12 +++-
 .../extensions/shop/templates/shop/index.html |  8 ++-
 .../extensions/shop/templates/shop/stall.html | 65 +++++++++++++++----
 lnbits/extensions/shop/views.py               | 14 +++-
 lnbits/extensions/shop/views_api.py           | 36 ++++++++--
 8 files changed, 141 insertions(+), 31 deletions(-)

diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/shop/crud.py
index 1986829e..dceaa203 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -148,16 +148,18 @@ async def create_shop_stall(data: createStalls) -> Stalls:
             id,
             wallet,
             name,
+            currency,
             publickey,
             relays,
             shippingzones
         )
-        VALUES (?, ?, ?, ?, ?, ?)
+        VALUES (?, ?, ?, ?, ?, ?, ?)
         """,
         (
             stall_id,
             data.wallet,
             data.name,
+            data.currency,
             data.publickey,
             data.relays,
             data.shippingzones,
@@ -447,17 +449,31 @@ async def get_shop_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
 
 
 async def get_shop_settings(user) -> Optional[ShopSettings]:
-    row = await db.fetchone("SELECT * FROM shop.settings WHERE 'user = ?", (user,))
+    row = await db.fetchone("""SELECT * FROM shop.settings WHERE "user" = ?""", (user,))
 
     return ShopSettings(**row) if row else None
 
 
-async def set_shop_settings(user: str, data) -> Optional[ShopSettings]:
+async def create_shop_settings(user: str, data):
     await db.execute(
-        f"""
+        """
+            INSERT INTO shop.settings ("user", currency, fiat_base_multiplier)
+            VALUES (?, ?, ?)
+        """,
+        (
+            user,
+            data.currency,
+            data.fiat_base_multiplier,
+        ),
+    )
+
+
+async def set_shop_settings(user: str, data):
+    await db.execute(
+        """
             UPDATE shop.settings
             SET currency = ?, fiat_base_multiplier = ?
-            WHERE 'user' = ?;
+            WHERE "user" = ?;
         """,
         (
             data.currency,
diff --git a/lnbits/extensions/shop/migrations.py b/lnbits/extensions/shop/migrations.py
index 2936695e..e6592dff 100644
--- a/lnbits/extensions/shop/migrations.py
+++ b/lnbits/extensions/shop/migrations.py
@@ -21,6 +21,7 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
+            currency TEXT,
             publickey TEXT,
             relays TEXT,
             shippingzones TEXT NOT NULL,
diff --git a/lnbits/extensions/shop/models.py b/lnbits/extensions/shop/models.py
index 2282cef0..ed6342f0 100644
--- a/lnbits/extensions/shop/models.py
+++ b/lnbits/extensions/shop/models.py
@@ -19,6 +19,7 @@ class Stalls(BaseModel):
     id: str
     wallet: str
     name: str
+    currency: str
     publickey: Optional[str]
     relays: Optional[str]
     shippingzones: str
@@ -27,6 +28,7 @@ class Stalls(BaseModel):
 class createStalls(BaseModel):
     wallet: str = Query(...)
     name: str = Query(...)
+    currency: str = Query("sat")
     publickey: str = Query(None)
     relays: str = Query(None)
     shippingzones: str = Query(...)
@@ -38,7 +40,7 @@ class createProduct(BaseModel):
     categories: str = Query(None)
     description: str = Query(None)
     image: str = Query(None)
-    price: int = Query(0, ge=0)
+    price: float = Query(0, ge=0)
     quantity: int = Query(0, ge=0)
 
 
@@ -49,19 +51,19 @@ class Products(BaseModel):
     categories: Optional[str]
     description: Optional[str]
     image: Optional[str]
-    price: int
+    price: float
     quantity: int
 
 
 class createZones(BaseModel):
-    cost: int = Query(0, ge=0)
+    cost: float = Query(0, ge=0)
     countries: str = Query(...)
 
 
 class Zones(BaseModel):
     id: str
     user: str
-    cost: int
+    cost: float
     countries: str
 
 
diff --git a/lnbits/extensions/shop/templates/shop/_dialogs.html b/lnbits/extensions/shop/templates/shop/_dialogs.html
index a55d7614..3718f38c 100644
--- a/lnbits/extensions/shop/templates/shop/_dialogs.html
+++ b/lnbits/extensions/shop/templates/shop/_dialogs.html
@@ -84,7 +84,11 @@
         dense
         v-model.number="productDialog.data.price"
         type="number"
-        label="Price"
+        :label="'Price (' + currencies.unit + ') *'"
+        :mask="currencies.unit != 'sat' ? '#.##' : '#'"
+        fill-mask="0"
+        reverse-fill-mask
+        :step="currencies.unit != 'sat' ? '0.01' : '1'"
       ></q-input>
       <q-input
         filled
@@ -142,9 +146,13 @@
       <q-input
         filled
         dense
+        :label="'Amount (' + currencies.unit + ') *'"
+        :mask="currencies.unit != 'sat' ? '#.##' : '#'"
+        fill-mask="0"
+        reverse-fill-mask
+        :step="currencies.unit != 'sat' ? '0.01' : '1'"
         type="number"
         v-model.trim="zoneDialog.data.cost"
-        label="Cost (sats)"
       ></q-input>
       <div class="row q-mt-lg">
         <q-btn
diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index d546ce47..acb1e5a3 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -188,6 +188,9 @@
   }
   const mapProducts = obj => {
     obj._data = _.clone(obj)
+    if ('{{  currency }}' != 'sat') {
+      obj.price /= 100
+    }
     return obj
   }
   const mapZone = obj => {
@@ -545,7 +548,7 @@
         LNbits.api
           .request(
             'PUT',
-            '/shop/api/v1/settings',
+            '/shop/api/v1/settings/' + this.g.user.id,
             this.g.user.wallets[0].adminkey,
             data
           )
@@ -680,6 +683,7 @@
           name: this.stallDialog.data.name,
           wallet: this.stallDialog.data.wallet,
           publickey: this.stallDialog.data.publickey || this.keys.pubkey,
+          currency: this.currencies.unit,
           relays: this.stallDialog.data.relays,
           shippingzones: this.stallDialog.data.shippingzones
             .map(z => z.split('-')[0].trim())
@@ -1376,6 +1380,8 @@
         this.onboarding.showAgain = showOnboard || false
         this.diagonAlley =
           this.$q.localStorage.getItem('lnbits.DAmode') || false
+        this.currencies.unit = '{{ currency }}'
+        console.log(this.currencies.unit, '{{currency}}')
         await this.getCurrencies()
         this.getStalls()
         this.getProducts()
diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index 6e776e86..18b89f37 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -48,7 +48,10 @@
               </q-item-section>
 
               <q-item-section side>
-                <span> {{p.price}} sats</span>
+                <span>
+                  {{unit != 'sat' ? getAmountFormated(p.price) : p.price +
+                  'sats'}}</span
+                >
               </q-item-section>
             </q-item>
             {% endraw %}
@@ -112,13 +115,18 @@
 
       <q-card-section class="q-py-sm">
         <div>
-          <!-- <div class="text-caption text-green-8 text-weight-bolder">
-            {{ stall.name }}
-          </div> -->
-          <span class="text-h6">{{ item.price }} sats</span
-          ><span class="q-ml-sm text-grey-6"
-            >BTC {{ (item.price / 1e8).toFixed(8) }}</span
-          >
+          <span v-if="unit == 'sat'">
+            <span class="text-h6">{{ item.price }} sats</span
+            ><span class="q-ml-sm text-grey-6"
+              >BTC {{ (item.price / 1e8).toFixed(8) }}</span
+            >
+          </span>
+          <span v-else>
+            <span class="text-h6">{{ getAmountFormated(item.price) }}</span>
+            <span v-if="exchangeRate" class="q-ml-sm text-grey-6"
+              >({{ getValueInSats(item.price) }} sats)</span
+            >
+          </span>
           <span
             class="q-ml-md text-caption text-green-8 text-weight-bolder q-mt-md"
             >{{item.quantity}} left</span
@@ -203,7 +211,12 @@
           />
         </div>
         <div class="row q-mt-lg">
-          {% raw %} Total: {{ finalCost }} {% endraw %}
+          {% raw %} Total: {{ unit != 'sat' ? getAmountFormated(finalCost) :
+          finalCost + 'sats' }}
+          <span v-if="unit != 'sat'" class="q-ml-sm text-grey-6"
+            >({{ getValueInSats(finalCost) }} sats)</span
+          >
+          {% endraw %}
         </div>
         <div class="row q-mt-lg">
           <q-btn
@@ -281,6 +294,8 @@
         products: [],
         searchText: null,
         diagonalley: false,
+        unit: 'sat',
+        exchangeRate: 0,
         cart: {
           total: 0,
           size: 0,
@@ -334,6 +349,28 @@
           products: new Map()
         }
       },
+      getAmountFormated(amount) {
+        return LNbits.utils.formatCurrency(amount.toFixed(2), this.unit)
+      },
+      async getRates() {
+        if (this.unit == 'sat') return
+        try {
+          let rate = (
+            await LNbits.api.request('POST', '/api/v1/conversion', null, {
+              amount: 1e8,
+              to: this.unit
+            })
+          ).data
+          this.exchangeRate = rate[this.unit]
+          console.log(this.exchangeRate)
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
+        }
+      },
+      getValueInSats(amount) {
+        if (!this.exchangeRate) return 0
+        return Math.ceil((amount / this.exchangeRate) * 1e8)
+      },
       addToCart(item) {
         let prod = this.cart.products
         if (prod.has(item.id)) {
@@ -382,7 +419,10 @@
         let data = {
           ...this.checkoutDialog.data,
           wallet: this.stall.wallet,
-          total: this.finalCost,
+          total:
+            this.unit != 'sat'
+              ? this.getValueInSats(this.finalCost)
+              : this.finalCost, // maybe this is better made in Python to allow API ordering?!
           products: Array.from(this.cart.products, p => {
             return {product_id: p[0], quantity: p[1].quantity}
           })
@@ -448,9 +488,12 @@
           })
       }
     },
-    created() {
+    async created() {
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = JSON.parse('{{ products | tojson }}')
+      this.unit = this.stall.currency
+      await this.getRates()
+      setInterval(this.getRates, 300000)
     }
   })
 </script>
diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index d9fbe64b..50d6357c 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -12,7 +12,7 @@ from starlette.responses import HTMLResponse
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
 from lnbits.extensions.shop import shop_ext, shop_renderer
-from lnbits.extensions.shop.models import CreateChatMessage
+from lnbits.extensions.shop.models import CreateChatMessage, SetSettings
 from lnbits.extensions.shop.notifier import Notifier
 
 from .crud import (
@@ -26,6 +26,8 @@ from .crud import (
     get_shop_zone,
     get_shop_zones,
     update_shop_product_stock,
+    get_shop_settings,
+    create_shop_settings,
 )
 
 templates = Jinja2Templates(directory="templates")
@@ -33,8 +35,16 @@ templates = Jinja2Templates(directory="templates")
 
 @shop_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
+    settings = await get_shop_settings(user=user.id)
+
+    if not settings:
+        await create_shop_settings(
+            user=user.id, data=SetSettings(currency="sat", fiat_base_multiplier=1)
+        )
+        settings = await get_shop_settings(user.id)
     return shop_renderer().TemplateResponse(
-        "shop/index.html", {"request": request, "user": user.dict()}
+        "shop/index.html",
+        {"request": request, "user": user.dict(), "currency": settings.currency},
     )
 
 
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index 86f0a8f5..398fc0b5 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -33,6 +33,7 @@ from .crud import (
     create_shop_product,
     create_shop_stall,
     create_shop_zone,
+    create_shop_settings,
     delete_shop_order,
     delete_shop_product,
     delete_shop_stall,
@@ -102,15 +103,21 @@ async def api_shop_product_create(
     product_id=None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
+    # For fiat currencies,
+    # we multiply by data.fiat_base_multiplier (usually 100) to save the value in cents.
+    settings = await get_shop_settings(user=wallet.wallet.user)
+    stall = await get_shop_stall(stall_id=data.stall)
+    if stall.currency != "sat":
+        data.price *= settings.fiat_base_multiplier
 
     if product_id:
         product = await get_shop_product(product_id)
         if not product:
-            return {"message": "Withdraw product does not exist."}
+            return {"message": "Product does not exist."}
 
-        stall = await get_shop_stall(stall_id=product.stall)
+        # stall = await get_shop_stall(stall_id=product.stall)
         if stall.wallet != wallet.wallet.id:
-            return {"message": "Not your withdraw product."}
+            return {"message": "Not your product."}
 
         product = await update_shop_product(product_id, **data.dict())
     else:
@@ -250,6 +257,8 @@ async def api_shop_orders(
         wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
     orders = await get_shop_orders(wallet_ids)
+    if not orders:
+        return
     orders_with_details = []
     for order in orders:
         order = order.dict()
@@ -472,9 +481,24 @@ async def api_get_settings(wallet: WalletTypeInfo = Depends(require_admin_key)):
     return settings
 
 
-@shop_ext.put("/api/v1/settings")
+@shop_ext.post("/api/v1/settings")
+@shop_ext.put("/api/v1/settings/{usr}")
 async def api_set_settings(
-    data: SetSettings, wallet: WalletTypeInfo = Depends(require_admin_key)
+    data: SetSettings,
+    usr: str = None,
+    wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
+    if usr:
+        if usr != wallet.wallet.user:
+            return {"message": "Not your Shop."}
+
+        settings = await get_shop_settings(user=usr)
+
+        if settings.user != wallet.wallet.user:
+            return {"message": "Not your Shop."}
+
+        return await set_shop_settings(usr, data)
+
     user = wallet.wallet.user
-    return await set_shop_settings(user, data)
+
+    return await create_shop_settings(user, data)

From 690ef743133c8b8ab03a712387b9663e81ec3ff8 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 29 Dec 2022 12:02:03 +0000
Subject: [PATCH 156/174] fix products price in fiat

---
 .../extensions/shop/templates/shop/order.html  | 18 +++++++++++++++++-
 .../extensions/shop/templates/shop/stall.html  | 14 +++++++++++---
 lnbits/extensions/shop/views.py                |  1 +
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index 0df0acb3..14d14f34 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -94,7 +94,10 @@
             </q-item-section>
 
             <q-item-section side>
-              <span> {{p.price}} sats</span>
+              <span v-if="stall.currency != 'sat'"
+                >{{ getAmountFormated(p.price) }}</span
+              >
+              <span v-else> {{p.price}} sats</span>
             </q-item-section>
           </q-item>
           {% endraw %}
@@ -273,6 +276,12 @@
     }
     return obj
   }
+
+  const mapProductsItems = obj => {
+    obj.price = (obj.price / 100).toFixed(2)
+
+    return obj
+  }
   Vue.component(VueQrcode.name, VueQrcode)
   const nostr = window.NostrTools
   new Vue({
@@ -314,6 +323,9 @@
       }
     },
     methods: {
+      getAmountFormated(amount) {
+        return LNbits.utils.formatCurrency(amount, this.stall.currency)
+      },
       clearMessage() {
         this.newMessage = ''
         this.$refs.newMessage.focus()
@@ -471,6 +483,10 @@
           price: product.price
         }
       })
+      console.log(this.stall)
+      if (this.stall.currency != 'sat') {
+        this.products = this.products.map(mapProductsItems)
+      }
 
       let data = this.$q.localStorage.getItem(`lnbits.shop.data`) || false
 
diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index 18b89f37..78424e26 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -284,6 +284,11 @@
 </div>
 {% endblock %} {% block scripts %}
 <script>
+  const mapProductsItems = obj => {
+    obj.price = (obj.price / 100).toFixed(2)
+
+    return obj
+  }
   Vue.component(VueQrcode.name, VueQrcode)
   new Vue({
     el: '#vue',
@@ -333,8 +338,8 @@
         let zoneCost = this.stall.zones.find(
           z => z.value == this.checkoutDialog.data.shippingzone
         )
-
-        return this.cart.total + zoneCost.cost
+        console.log(+this.cart.total, zoneCost.cost)
+        return +this.cart.total + zoneCost.cost
       }
     },
     methods: {
@@ -350,7 +355,7 @@
         }
       },
       getAmountFormated(amount) {
-        return LNbits.utils.formatCurrency(amount.toFixed(2), this.unit)
+        return LNbits.utils.formatCurrency(amount, this.unit)
       },
       async getRates() {
         if (this.unit == 'sat') return
@@ -492,6 +497,9 @@
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = JSON.parse('{{ products | tojson }}')
       this.unit = this.stall.currency
+      if (this.unit != 'sat') {
+        this.products = this.products.map(mapProductsItems)
+      }
       await this.getRates()
       setInterval(this.getRates, 300000)
     }
diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index 50d6357c..c6be5f58 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -122,6 +122,7 @@ async def order_chat(
                 "name": stall.name,
                 "publickey": stall.publickey,
                 "wallet": stall.wallet,
+                "currency": stall.currency,
             },
             "publickey": keys.split(",")[0] if keys else None,
             "privatekey": keys.split(",")[1] if keys else None,

From 860e6ddc4aad7300dd23e276292ca639462cfb76 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Thu, 29 Dec 2022 22:19:38 +0000
Subject: [PATCH 157/174] Added to ignore

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index e0a42fc3..fad30825 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -106,6 +106,7 @@ exclude = """(?x)(
     | ^lnbits/extensions/paywall.
     | ^lnbits/extensions/satspay.
     | ^lnbits/extensions/scrub.
+    | ^lnbits/extensions/shop.
     | ^lnbits/extensions/splitpayments.
     | ^lnbits/extensions/streamalerts.
     | ^lnbits/extensions/tipjar.

From 91afd69a95a85c289d3142bcd94e0cb0f147d259 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Thu, 29 Dec 2022 23:58:36 +0000
Subject: [PATCH 158/174] format

---
 lnbits/extensions/shop/crud.py      |  2 +-
 lnbits/extensions/shop/views.py     |  4 ++--
 lnbits/extensions/shop/views_api.py | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/shop/crud.py
index dceaa203..682c1708 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -9,7 +9,6 @@ from lnbits.settings import WALLET
 
 from . import db
 from .models import (
-    ShopSettings,
     ChatMessage,
     CreateChatMessage,
     CreateMarket,
@@ -18,6 +17,7 @@ from .models import (
     OrderDetail,
     Orders,
     Products,
+    ShopSettings,
     Stalls,
     Zones,
     createOrder,
diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index c6be5f58..8dad15ae 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -17,17 +17,17 @@ from lnbits.extensions.shop.notifier import Notifier
 
 from .crud import (
     create_chat_message,
+    create_shop_settings,
     get_shop_market,
     get_shop_market_stalls,
     get_shop_order_details,
     get_shop_order_invoiceid,
     get_shop_products,
+    get_shop_settings,
     get_shop_stall,
     get_shop_zone,
     get_shop_zones,
     update_shop_product_stock,
-    get_shop_settings,
-    create_shop_settings,
 )
 
 templates = Jinja2Templates(directory="templates")
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index 398fc0b5..a85d1618 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -9,7 +9,6 @@ from fastapi.params import Depends
 from loguru import logger
 from secp256k1 import PrivateKey, PublicKey
 from starlette.exceptions import HTTPException
-from lnbits.utils.exchange_rates import currencies, get_fiat_rate_satoshis
 
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
@@ -21,19 +20,18 @@ from lnbits.decorators import (
     require_invoice_key,
 )
 from lnbits.helpers import urlsafe_short_hash
+from lnbits.utils.exchange_rates import currencies, get_fiat_rate_satoshis
 
 from . import db, shop_ext
 from .crud import (
-    set_shop_settings,
-    get_shop_settings,
     create_shop_market,
     create_shop_market_stalls,
     create_shop_order,
     create_shop_order_details,
     create_shop_product,
+    create_shop_settings,
     create_shop_stall,
     create_shop_zone,
-    create_shop_settings,
     delete_shop_order,
     delete_shop_product,
     delete_shop_stall,
@@ -50,22 +48,24 @@ from .crud import (
     get_shop_orders,
     get_shop_product,
     get_shop_products,
+    get_shop_settings,
     get_shop_stall,
     get_shop_stalls,
     get_shop_stalls_by_ids,
     get_shop_zone,
     get_shop_zones,
     set_shop_order_pubkey,
+    set_shop_settings,
     update_shop_market,
     update_shop_product,
     update_shop_stall,
     update_shop_zone,
 )
 from .models import (
-    SetSettings,
     CreateMarket,
     Orders,
     Products,
+    SetSettings,
     Stalls,
     Zones,
     createOrder,

From 0fdc13666f611303318ee8d202a2d34194a4e42a Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Dec 2022 10:00:11 +0000
Subject: [PATCH 159/174] fix NaN in cart total

---
 lnbits/extensions/shop/templates/shop/stall.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index 78424e26..e2b70f36 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -338,7 +338,6 @@
         let zoneCost = this.stall.zones.find(
           z => z.value == this.checkoutDialog.data.shippingzone
         )
-        console.log(+this.cart.total, zoneCost.cost)
         return +this.cart.total + zoneCost.cost
       }
     },
@@ -367,7 +366,6 @@
             })
           ).data
           this.exchangeRate = rate[this.unit]
-          console.log(this.exchangeRate)
         } catch (error) {
           LNbits.utils.notifyApiError(error)
         }
@@ -397,7 +395,7 @@
           icon: 'thumb_up'
         })
         this.cart.products = prod
-        this.updateCart(item.price)
+        this.updateCart(+item.price)
       },
       removeFromCart() {},
       updateCart(price) {

From 0b9672076d8fcc004f020d8e85aa38abac141d94 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Dec 2022 10:30:29 +0000
Subject: [PATCH 160/174] add remove product and reset cart buttons

---
 .../extensions/shop/templates/shop/stall.html | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index e2b70f36..f1050e23 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -27,10 +27,10 @@
           {{ cart.size }}
         </q-badge>
         {% endraw %}
-        <q-menu auto-close v-if="cart.size">
+        <q-menu v-if="cart.size">
           <q-list style="min-width: 100px">
             {% raw %}
-            <q-item clickable :key="p.id" v-for="p in cartMenu">
+            <q-item :key="p.id" v-for="p in cartMenu">
               <q-item-section side>
                 <span>{{p.quantity}} x </span>
               </q-item-section>
@@ -50,20 +50,35 @@
               <q-item-section side>
                 <span>
                   {{unit != 'sat' ? getAmountFormated(p.price) : p.price +
-                  'sats'}}</span
-                >
+                  'sats'}}
+                  <q-btn
+                    class="q-ml-md"
+                    round
+                    color="red"
+                    size="xs"
+                    icon="close"
+                    @click="removeFromCart(p)"
+                  />
+                </span>
               </q-item-section>
             </q-item>
             {% endraw %}
             <q-separator />
           </q-list>
-          <div class="q-pa-md q-gutter-md">
+          <div class="row q-pa-md q-gutter-md">
             <q-btn
               color="primary"
               icon-right="checkout"
               label="Checkout"
               @click="checkoutDialog.show = true"
-            />
+            ></q-btn>
+            <q-btn
+              class="q-ml-lg"
+              flat
+              color="primary"
+              label="Reset"
+              @click="resetCart"
+            /></q-btn>
           </div>
         </q-menu>
       </q-btn>
@@ -397,13 +412,23 @@
         this.cart.products = prod
         this.updateCart(+item.price)
       },
-      removeFromCart() {},
-      updateCart(price) {
-        this.cart.total += price
-        this.cart.size++
+      removeFromCart(item) {
+        this.cart.products.delete(item.id)
+        this.updateCart(+item.price, true)
+      },
+      updateCart(price, del = false) {
+        console.log(this.cart, this.cartMenu)
+        if (del) {
+          this.cart.total -= price
+          this.cart.size--
+        } else {
+          this.cart.total += price
+          this.cart.size++
+        }
         this.cartMenu = Array.from(this.cart.products, item => {
           return {id: item[0], ...item[1]}
         })
+        console.log(this.cart, this.cartMenu)
       },
       getPubkey() {
         let data = this.$q.localStorage.getItem(`lnbits.shop.data`)
@@ -503,8 +528,4 @@
     }
   })
 </script>
-<style scoped>
-  .card--product {
-  }
-</style>
 {% endblock %}

From 301cfb25d9cb20d9c6bfe94748ad4cd9683d46c8 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Dec 2022 10:59:24 +0000
Subject: [PATCH 161/174] market is not fully ready! added stall name

---
 lnbits/extensions/shop/templates/shop/market.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/market.html b/lnbits/extensions/shop/templates/shop/market.html
index a9585bca..29631f08 100644
--- a/lnbits/extensions/shop/templates/shop/market.html
+++ b/lnbits/extensions/shop/templates/shop/market.html
@@ -125,7 +125,7 @@
           >
         </div>
         <div v-if="item.categories" class="text-subtitle1">
-          <q-chip v-for="cat in item.categories.split(',')" dense
+          <q-chip v-for="(cat, i) in item.categories.split(',')" :key="i" dense
             >{{cat}}</q-chip
           >
         </div>
@@ -140,13 +140,17 @@
       <q-separator></q-separator>
 
       <q-card-actions>
+        <span>{{ stall.find(s => s.id == item.stall).name }}</span>
         <q-btn
           flat
-          class="text-weight-bold text-capitalize"
+          class="text-weight-bold text-capitalize q-ml-auto"
           dense
           color="primary"
+          type="a"
+          :href="'/shop/stalls/' + item.stall"
+          target="_blank"
         >
-          View details
+          Visit shop
         </q-btn>
       </q-card-actions>
       {% endraw %}

From 77051d26090b4a8064d944fb48d2ca63e5f770d9 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Dec 2022 12:00:16 +0000
Subject: [PATCH 162/174] toggle shipped

---
 lnbits/extensions/shop/templates/shop/index.html | 4 +++-
 lnbits/extensions/shop/views_api.py              | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index acb1e5a3..5c02677d 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -1194,10 +1194,12 @@
           })
       },
       shipOrder(order_id) {
+        let shipped = this.orders.find(o => o.id == order_id).shipped
+        console.log(this.orders, order_id, shipped)
         LNbits.api
           .request(
             'GET',
-            '/shop/api/v1/orders/shipped/' + order_id,
+            `/shop/api/v1/orders/shipped/${order_id}?shipped=${!shipped}`,
             this.g.user.wallets[0].inkey
           )
           .then(response => {
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index a85d1618..41e0ca88 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -358,12 +358,12 @@ async def api_shop_order_pubkey(payment_hash: str, pubkey: str):
 
 @shop_ext.get("/api/v1/orders/shipped/{order_id}")
 async def api_shop_order_shipped(
-    order_id, wallet: WalletTypeInfo = Depends(get_key_type)
+    order_id, shipped: bool = Query(...), wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     await db.execute(
         "UPDATE shop.orders SET shipped = ? WHERE id = ?",
         (
-            True,
+            shipped,
             order_id,
         ),
     )

From 715709ce2520c8f452c8e5f86a7a3864dcc97a54 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Dec 2022 12:03:34 +0000
Subject: [PATCH 163/174] fix typo

---
 lnbits/extensions/shop/templates/shop/stall.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index f1050e23..08e59888 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -78,7 +78,7 @@
               color="primary"
               label="Reset"
               @click="resetCart"
-            /></q-btn>
+            ></q-btn>
           </div>
         </q-menu>
       </q-btn>

From 7c1a639796e86330b9d4d4bf1df247b2c8beb1ee Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Dec 2022 16:51:09 +0000
Subject: [PATCH 164/174] make markets great again

---
 lnbits/extensions/shop/crud.py                |  14 +-
 .../shop/templates/shop/_dialogs.html         |   4 +-
 .../shop/templates/shop/_tables.html          |   6 +-
 .../extensions/shop/templates/shop/index.html |  90 ++---
 .../shop/templates/shop/market.html           | 347 +++---------------
 .../extensions/shop/templates/shop/stall.html |   2 +-
 lnbits/extensions/shop/views_api.py           |   5 +-
 7 files changed, 101 insertions(+), 367 deletions(-)

diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/shop/crud.py
index 682c1708..2411fd38 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -399,8 +399,18 @@ async def create_shop_market_stalls(market_id: str, data: List[CreateMarketStall
     return market_stalls
 
 
-async def update_shop_market(market_id):
-    pass
+async def update_shop_market(market_id: str, name: str):
+    await db.execute(
+        "UPDATE shop.markets SET name = ? WHERE id = ?",
+        (name, market_id),
+    )
+    await db.execute(
+        "DELETE FROM shop.market_stalls WHERE marketid = ?",
+        (market_id,),
+    )
+
+    market = await get_shop_market(market_id)
+    return market
 
 
 ### CHAT / MESSAGES
diff --git a/lnbits/extensions/shop/templates/shop/_dialogs.html b/lnbits/extensions/shop/templates/shop/_dialogs.html
index 3718f38c..d2c22350 100644
--- a/lnbits/extensions/shop/templates/shop/_dialogs.html
+++ b/lnbits/extensions/shop/templates/shop/_dialogs.html
@@ -195,12 +195,12 @@
       ></q-toggle>
       <q-select
         filled
-        dense
         multiple
         emit-value
         :options="stalls.map(s => ({label: s.name, value: s.id}))"
         label="Stalls"
-        v-model.trim="marketDialog.data.stalls"
+        v-model="marketDialog.data.stalls"
+        map-options
       ></q-select>
       <q-input
         filled
diff --git a/lnbits/extensions/shop/templates/shop/_tables.html b/lnbits/extensions/shop/templates/shop/_tables.html
index 3cf66f62..15874824 100644
--- a/lnbits/extensions/shop/templates/shop/_tables.html
+++ b/lnbits/extensions/shop/templates/shop/_tables.html
@@ -354,14 +354,14 @@
             <q-tooltip> Link to pass to stall relay </q-tooltip>
           </q-td>
           <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            {{ col.value }}
+            {{ col.name == 'stalls' ? stallName(col.value) : col.value }}
           </q-td>
           <q-td auto-width>
             <q-btn
               flat
               dense
               size="xs"
-              @click="openStallUpdateDialog(props.row.id)"
+              @click="openMarketUpdateDialog(props.row.id)"
               icon="edit"
               color="light-blue"
             ></q-btn>
@@ -369,7 +369,7 @@
               flat
               dense
               size="xs"
-              @click="deleteStall(props.row.id)"
+              @click="deleteMarket(props.row.id)"
               icon="cancel"
               color="pink"
             ></q-btn>
diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 5c02677d..4d995fce 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -213,12 +213,12 @@
 
   const mapMarkets = obj => {
     obj._data = _.clone(obj)
-    obj.stores = []
+    obj.stalls = []
     LNbits.api
       .request('GET', `/shop/api/v1/markets/${obj.id}/stalls`, null)
       .then(response => {
         if (response.data) {
-          obj.stores = response.data.map(s => s.name).toString()
+          obj.stalls = response.data.map(s => s.id) //.toString()
         }
       })
       .catch(error => {
@@ -460,10 +460,10 @@
               field: 'name'
             },
             {
-              name: 'stores',
+              name: 'stalls',
               align: 'left',
               label: 'Stalls',
-              field: 'stores'
+              field: 'stalls'
             }
           ],
           pagination: {
@@ -637,6 +637,9 @@
       ////////////////////////////////////////
       ////////////////STALLS//////////////////
       ////////////////////////////////////////
+      stallName(id) {
+        return id.map(c => this.stalls.find(s => s.id == c).name).toString()
+      },
       getStalls: function () {
         var self = this
         LNbits.api
@@ -1035,44 +1038,38 @@
           })
       },
 
-      openShopUpdateDialog: function (linkId) {
-        var self = this
-        var link = _.findWhere(self.markets, {id: linkId})
-
-        this.marketDialog.data = _.clone(link._data)
+      openMarketUpdateDialog(linkId) {
+        var link = _.findWhere(this.markets, {id: linkId})
+        this.marketDialog.data = link
         this.marketDialog.show = true
       },
-      sendMarketplaceFormData: function () {
+      sendMarketplaceFormData() {
         let data = {...this.marketDialog.data}
 
         if (!data.usr) {
           data.usr = this.g.user.id
         }
-
         if (data.id) {
-          this.updateZone(data)
+          this.updateMarketplace(data)
         } else {
           this.createMarketplace(data)
         }
       },
-      updateShop: function (data) {
-        var self = this
+      updateMarketplace(data) {
         LNbits.api
           .request(
             'PUT',
-            '/shop/api/v1/shops' + data.id,
-            _.findWhere(self.g.user.wallets, {
-              id: self.marketDialog.data.wallet
-            }).inkey,
-            _.pick(data, 'countries', 'cost')
+            '/shop/api/v1/markets/' + data.id,
+            this.g.user.wallets[0].inkey,
+            data
           )
-          .then(function (response) {
-            self.markets = _.reject(self.markets, function (obj) {
+          .then(response => {
+            this.markets = _.reject(this.markets, obj => {
               return obj.id == data.id
             })
-            self.markets.push(mapShops(response.data))
-            self.marketDialog.show = false
-            self.marketDialog.data = {}
+            this.markets.push(mapMarkets(response.data))
+            this.marketDialog.show = false
+            this.marketDialog.data = {}
             data = {}
           })
           .catch(function (error) {
@@ -1097,21 +1094,20 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      deleteShop: function (shopId) {
-        var self = this
-        var shop = _.findWhere(self.markets, {id: shopId})
+      deleteMarket(shopId) {
+        let market = _.findWhere(this.markets, {id: shopId})
 
         LNbits.utils
-          .confirmDialog('Are you sure you want to delete this Shop link?')
-          .onOk(function () {
+          .confirmDialog('Are you sure you want to delete this Marketplace?')
+          .onOk(() => {
             LNbits.api
               .request(
                 'DELETE',
-                '/shop/api/v1/shops/' + shopId,
-                _.findWhere(self.g.user.wallets, {id: shop.wallet}).inkey
+                '/shop/api/v1/markets/' + shopId,
+                this.g.user.wallets[0].inkey
               )
-              .then(function (response) {
-                self.markets = _.reject(self.markets, function (obj) {
+              .then(response => {
+                this.markets = _.reject(this.markets, obj => {
                   return obj.id == shopId
                 })
               })
@@ -1144,32 +1140,6 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      /*createOrder: function () {
-        var data = {
-          address: this.orderDialog.data.address,
-          email: this.orderDialog.data.email,
-          quantity: this.orderDialog.data.quantity,
-          shippingzone: this.orderDialog.data.shippingzone
-        }
-        var self = this
-
-        LNbits.api
-          .request(
-            'POST',
-            '/shop/api/v1/orders',
-            _.findWhere(self.g.user.wallets, {id: self.orderDialog.data.wallet})
-              .inkey,
-            data
-          )
-          .then(function (response) {
-            self.orders.push(mapOrders(response.data))
-            self.orderDialog.show = false
-            self.orderDialog.data = {}
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },*/
       deleteOrder: function (orderId) {
         var self = this
         var order = _.findWhere(self.orders, {id: orderId})
@@ -1195,7 +1165,6 @@
       },
       shipOrder(order_id) {
         let shipped = this.orders.find(o => o.id == order_id).shipped
-        console.log(this.orders, order_id, shipped)
         LNbits.api
           .request(
             'GET',
@@ -1383,7 +1352,6 @@
         this.diagonAlley =
           this.$q.localStorage.getItem('lnbits.DAmode') || false
         this.currencies.unit = '{{ currency }}'
-        console.log(this.currencies.unit, '{{currency}}')
         await this.getCurrencies()
         this.getStalls()
         this.getProducts()
diff --git a/lnbits/extensions/shop/templates/shop/market.html b/lnbits/extensions/shop/templates/shop/market.html
index 29631f08..4aadfa26 100644
--- a/lnbits/extensions/shop/templates/shop/market.html
+++ b/lnbits/extensions/shop/templates/shop/market.html
@@ -21,49 +21,6 @@
           </template>
         </q-input>
       </div>
-      <q-btn dense round flat icon="shopping_cart">
-        {% raw %}
-        <q-badge v-if="cart.size" color="red" class="text-bold" floating>
-          {{ cart.size }}
-        </q-badge>
-        {% endraw %}
-        <q-menu auto-close v-if="cart.size">
-          <q-list style="min-width: 100px">
-            {% raw %}
-            <q-item clickable :key="p.id" v-for="p in cartMenu">
-              <q-item-section side>
-                <span>{{p.quantity}} x </span>
-              </q-item-section>
-              <q-item-section avatar>
-                <q-avatar color="primary">
-                  <img
-                    size="sm"
-                    :src="products.find(f => f.id == p.id).image"
-                  />
-                </q-avatar>
-              </q-item-section>
-
-              <q-item-section>
-                <q-item-label>{{ p.name }}</q-item-label>
-              </q-item-section>
-
-              <q-item-section side>
-                <span> {{p.price}} sats</span>
-              </q-item-section>
-            </q-item>
-            {% endraw %}
-            <q-separator />
-          </q-list>
-          <div class="q-pa-md q-gutter-md">
-            <q-btn
-              color="primary"
-              icon-right="checkout"
-              label="Checkout"
-              @click="checkoutDialog.show = true"
-            />
-          </div>
-        </q-menu>
-      </q-btn>
     </q-toolbar>
   </div>
 </div>
@@ -85,22 +42,6 @@
       ></q-img>
 
       <q-card-section class="q-pb-xs q-pt-md">
-        <q-btn
-          round
-          :disabled="item.quantity < 1"
-          color="primary"
-          icon="shopping_cart"
-          size="lg"
-          style="
-            position: absolute;
-            top: 0;
-            right: 0;
-            transform: translate(-50%, -50%);
-          "
-          @click="addToCart(item)"
-          ><q-tooltip> Add to cart </q-tooltip></q-btn
-        >
-
         <div class="row no-wrap items-center">
           <div class="col text-subtitle2 ellipsis-2-lines">
             {{ item.product }}
@@ -112,13 +53,23 @@
 
       <q-card-section class="q-py-sm">
         <div>
-          <!-- <div class="text-caption text-green-8 text-weight-bolder">
-            {{ stall.name }}
-          </div> -->
-          <span class="text-h6">{{ item.price }} sats</span
-          ><span class="q-ml-sm text-grey-6"
-            >BTC {{ (item.price / 1e8).toFixed(8) }}</span
-          >
+          <div class="text-caption text-weight-bolder">
+            {{ item.stallName }}
+          </div>
+          <span v-if="item.currency == 'sat'">
+            <span class="text-h6">{{ item.price }} sats</span
+            ><span class="q-ml-sm text-grey-6"
+              >BTC {{ (item.price / 1e8).toFixed(8) }}</span
+            >
+          </span>
+          <span v-else>
+            <span class="text-h6"
+              >{{ getAmountFormated(item.price, item.currency) }}</span
+            >
+            <span v-if="exchangeRates" class="q-ml-sm text-grey-6"
+              >({{ getValueInSats(item.price, item.currency) }} sats)</span
+            >
+          </span>
           <span
             class="q-ml-md text-caption text-green-8 text-weight-bolder q-mt-md"
             >{{item.quantity}} left</span
@@ -140,7 +91,7 @@
       <q-separator></q-separator>
 
       <q-card-actions>
-        <span>{{ stall.find(s => s.id == item.stall).name }}</span>
+        <span>{{ item.stallName }}</span>
         <q-btn
           flat
           class="text-weight-bold text-capitalize q-ml-auto"
@@ -156,110 +107,6 @@
       {% endraw %}
     </q-card>
   </div>
-  <!-- CHECKOUT DIALOG -->
-  <q-dialog v-model="checkoutDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="placeOrder" class="q-gutter-md">
-        <q-input
-          filled
-          dense
-          v-model.trim="checkoutDialog.data.username"
-          label="Name *optional"
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.trim="checkoutDialog.data.address"
-          label="Address"
-        ></q-input>
-        <!-- <q-input
-          filled
-          dense
-          v-model.trim="checkoutDialog.data.address_2"
-          label="Address (line 2)"
-        ></q-input> -->
-        <q-input
-          v-model="checkoutDialog.data.email"
-          filled
-          dense
-          type="email"
-          label="Email"
-        ></q-input>
-        <p>Select the shipping zone:</p>
-        <div class="row q-mt-lg">
-          <q-option-group
-            :options="stall.zones"
-            type="radio"
-            emit-value
-            v-model="checkoutDialog.data.shippingzone"
-          />
-        </div>
-        <div class="row q-mt-lg">
-          {% raw %} Total: {{ finalCost }} {% endraw %}
-        </div>
-        <div class="row q-mt-lg">
-          <q-btn
-            unelevated
-            color="primary"
-            :disable="checkoutDialog.data.address == null
-              || checkoutDialog.data.email == null
-              || checkoutDialog.data.shippingzone == null"
-            type="submit"
-            >Checkout</q-btn
-          >
-          <q-btn
-            v-close-popup
-            flat
-            @click="checkoutDialog = {show: false, data: {}}"
-            color="grey"
-            class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-  <!-- INVOICE DIALOG -->
-  <q-dialog
-    v-model="qrCodeDialog.show"
-    position="top"
-    @hide="closeQrCodeDialog"
-  >
-    <q-card
-      v-if="!qrCodeDialog.data.payment_request"
-      class="q-pa-lg q-pt-xl lnbits__dialog-card"
-    >
-    </q-card>
-    <q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <div class="text-center q-mb-lg">
-        <a :href="'lightning:' + qrCodeDialog.data.payment_request">
-          <q-responsive :ratio="1" class="q-mx-xl">
-            <qrcode
-              :value="qrCodeDialog.data.payment_request"
-              :options="{width: 340}"
-              class="rounded-borders"
-            ></qrcode>
-          </q-responsive>
-        </a>
-      </div>
-      <div class="row q-mt-lg">
-        <q-btn
-          outline
-          color="grey"
-          @click="copyText(qrCodeDialog.data.payment_request)"
-          >Copy invoice</q-btn
-        >
-        <q-btn
-          @click="closeQrCodeDialog"
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          >Close</q-btn
-        >
-      </div>
-    </q-card>
-  </q-dialog>
 </div>
 {% endblock %} {% block scripts %}
 <script>
@@ -269,25 +116,10 @@
     mixins: [windowMixin],
     data: function () {
       return {
-        stall: null,
+        stalls: null,
         products: [],
         searchText: null,
-        cart: {
-          total: 0,
-          size: 0,
-          products: new Map()
-        },
-        cartMenu: [],
-        checkoutDialog: {
-          show: false,
-          data: {}
-        },
-        qrCodeDialog: {
-          data: {
-            payment_request: null
-          },
-          show: false
-        }
+        exchangeRates: null
       }
     },
     computed: {
@@ -300,124 +132,47 @@
             p.categories.includes(this.searchText)
           )
         })
-      },
-      finalCost() {
-        if (!this.checkoutDialog.data.shippingzone) return this.cart.total
-
-        let zoneCost = this.stall.zones.find(
-          z => z.value == this.checkoutDialog.data.shippingzone
-        )
-
-        return this.cart.total + zoneCost.cost
       }
     },
     methods: {
-      closeQrCodeDialog() {
-        this.qrCodeDialog.dismissMsg()
-        this.qrCodeDialog.show = false
-      },
-      resetCart() {
-        this.cart = {
-          total: 0,
-          size: 0,
-          products: new Map()
+      async getRates() {
+        let hasFiat = this.stalls.map(s => s.currency).every(c => c != 'sat')
+        if (!hasFiat) return
+        try {
+          let rates = await axios.get('https://api.opennode.co/v1/rates')
+          this.exchangeRates = rates.data.data
+          console.log(this.exchangeRates)
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
         }
       },
-      addToCart(item) {
-        let prod = this.cart.products
-        if (prod.has(item.id)) {
-          let qty = prod.get(item.id).quantity
-          prod.set(item.id, {
-            ...prod.get(item.id),
-            quantity: qty + 1
-          })
-        } else {
-          prod.set(item.id, {
-            name: item.product,
-            quantity: 1,
-            price: item.price
-          })
-        }
-        this.cart.products = prod
-        this.updateCart(item.price)
+      getValueInSats(amount, unit = 'USD') {
+        if (!this.exchangeRates) return 0
+        return Math.ceil(
+          (amount / this.exchangeRates[`BTC${unit}`][unit]) * 1e8
+        )
       },
-      removeFromCart() {},
-      updateCart(price) {
-        this.cart.total += price
-        this.cart.size++
-        this.cartMenu = Array.from(this.cart.products, item => {
-          return {id: item[0], ...item[1]}
-        })
-        console.log(this.cartMenu, this.cart)
-      },
-      placeOrder() {
-        let dialog = this.checkoutDialog.data
-        let data = {
-          ...this.checkoutDialog.data,
-          wallet: this.stall.wallet,
-          total: this.finalCost,
-          products: Array.from(this.cart.products, p => {
-            return {product_id: p[0], quantity: p[1].quantity}
-          })
-        }
-        LNbits.api
-          .request('POST', '/shop/api/v1/orders', null, data)
-          .then(res => {
-            this.checkoutDialog = {show: false, data: {}}
-
-            return res.data
-          })
-          .then(data => {
-            this.qrCodeDialog.data = data
-            this.qrCodeDialog.show = true
-
-            this.qrCodeDialog.dismissMsg = this.$q.notify({
-              timeout: 0,
-              message: 'Waiting for payment...'
-            })
-            return data
-          })
-          .then(data => {
-            this.qrCodeDialog.paymentChecker = setInterval(() => {
-              LNbits.api
-                .request(
-                  'GET',
-                  `/shop/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
-                )
-                .then(res => {
-                  if (res.data.paid) {
-                    this.$q.notify({
-                      type: 'positive',
-                      message: 'Sats received, thanks!',
-                      icon: 'thumb_up'
-                    })
-                    clearInterval(this.qrCodeDialog.paymentChecker)
-                    this.resetCart()
-                    this.closeQrCodeDialog()
-                  }
-                })
-                .catch(error => {
-                  console.error(error)
-                  LNbits.utils.notifyApiError(error)
-                })
-            }, 3000)
-          })
-          .catch(error => {
-            console.error(error)
-            LNbits.utils.notifyApiError(error)
-          })
+      getAmountFormated(amount, unit = 'USD') {
+        return LNbits.utils.formatCurrency(amount, unit)
       }
     },
-    created() {
-      this.stall = JSON.parse('{{ stalls | tojson }}')
-      this.products = JSON.parse('{{ products | tojson }}')
+    async created() {
+      this.stalls = JSON.parse('{{ stalls | tojson }}')
+      let products = JSON.parse('{{ products | tojson }}')
 
-      console.log(this.stall, this.products)
+      this.products = products.map(obj => {
+        let stall = this.stalls.find(s => s.id == obj.stall)
+        obj.currency = stall.currency
+        if (obj.currency != 'sat') {
+          obj.price = parseFloat((obj.price / 100).toFixed(2))
+        }
+        obj.stallName = stall.name
+        return obj
+      })
+      await this.getRates()
+
+      console.log(this.stalls, this.products)
     }
   })
 </script>
-<style scoped>
-  .card--product {
-  }
-</style>
 {% endblock %}
diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index 08e59888..dc6c2049 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -300,7 +300,7 @@
 {% endblock %} {% block scripts %}
 <script>
   const mapProductsItems = obj => {
-    obj.price = (obj.price / 100).toFixed(2)
+    obj.price = parseFloat((obj.price / 100).toFixed(2))
 
     return obj
   }
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index 41e0ca88..bc098dee 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -439,10 +439,11 @@ async def api_shop_stall_create(
         if market.usr != wallet.wallet.user:
             return {"message": "Not your market."}
 
-        market = await update_shop_market(market_id, **data.dict())
+        market = await update_shop_market(market_id, data.name)
     else:
         market = await create_shop_market(data=data)
-        await create_shop_market_stalls(market_id=market.id, data=data.stalls)
+
+    await create_shop_market_stalls(market_id=market.id, data=data.stalls)
 
     return market.dict()
 

From b6f87e5a1efb942390c85cbac13527fa774a23db Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Fri, 30 Dec 2022 17:07:06 +0000
Subject: [PATCH 165/174] some sat sugar in market products

---
 lnbits/extensions/shop/templates/shop/market.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/market.html b/lnbits/extensions/shop/templates/shop/market.html
index 4aadfa26..96695041 100644
--- a/lnbits/extensions/shop/templates/shop/market.html
+++ b/lnbits/extensions/shop/templates/shop/market.html
@@ -136,12 +136,11 @@
     },
     methods: {
       async getRates() {
-        let hasFiat = this.stalls.map(s => s.currency).every(c => c != 'sat')
-        if (!hasFiat) return
+        let noFiat = this.stalls.map(s => s.currency).every(c => c == 'sat')
+        if (noFiat) return
         try {
           let rates = await axios.get('https://api.opennode.co/v1/rates')
           this.exchangeRates = rates.data.data
-          console.log(this.exchangeRates)
         } catch (error) {
           LNbits.utils.notifyApiError(error)
         }
@@ -170,8 +169,6 @@
         return obj
       })
       await this.getRates()
-
-      console.log(this.stalls, this.products)
     }
   })
 </script>

From f998681dc071a5a3cc8f69dc2a283e1b5dd27e5d Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 3 Jan 2023 20:51:38 +0000
Subject: [PATCH 166/174] int to float

---
 lnbits/extensions/shop/templates/shop/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 4d995fce..49ddf6fb 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -946,7 +946,7 @@
       sendZoneFormData: function () {
         var data = {
           countries: String(this.zoneDialog.data.countries),
-          cost: parseInt(this.zoneDialog.data.cost)
+          cost: parseFloat(this.zoneDialog.data.cost)
         }
         if (this.zoneDialog.data.id) {
           data.id = this.zoneDialog.data.id

From dc2689f2c1f38b7fda0199f307729effff02025f Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 3 Jan 2023 20:54:38 +0000
Subject: [PATCH 167/174] Name fix

---
 lnbits/extensions/shop/templates/shop/market.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/market.html b/lnbits/extensions/shop/templates/shop/market.html
index 96695041..403e9fa8 100644
--- a/lnbits/extensions/shop/templates/shop/market.html
+++ b/lnbits/extensions/shop/templates/shop/market.html
@@ -91,7 +91,7 @@
       <q-separator></q-separator>
 
       <q-card-actions>
-        <span>{{ item.stallName }}</span>
+        <span>Stall: {{ item.stallName }}</span>
         <q-btn
           flat
           class="text-weight-bold text-capitalize q-ml-auto"
@@ -101,7 +101,7 @@
           :href="'/shop/stalls/' + item.stall"
           target="_blank"
         >
-          Visit shop
+          Visit Stall
         </q-btn>
       </q-card-actions>
       {% endraw %}

From fc3465c750f1edbf3ccdf8e756f6bc8d9005a147 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 3 Jan 2023 21:01:30 +0000
Subject: [PATCH 168/174] Added some titling

---
 lnbits/extensions/shop/templates/shop/market.html | 2 +-
 lnbits/extensions/shop/templates/shop/stall.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/shop/templates/shop/market.html b/lnbits/extensions/shop/templates/shop/market.html
index 403e9fa8..6763ef3b 100644
--- a/lnbits/extensions/shop/templates/shop/market.html
+++ b/lnbits/extensions/shop/templates/shop/market.html
@@ -3,7 +3,7 @@
   <div class="col-12 q-gutter-y-md">
     <q-toolbar class="row">
       <div class="col">
-        <q-toolbar-title> {{ market.name }} </q-toolbar-title>
+        <q-toolbar-title> Market: {{ market.name }} </q-toolbar-title>
       </div>
       <div class="col q-mx-md">
         <q-input
diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/shop/templates/shop/stall.html
index dc6c2049..f715cf37 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/shop/templates/shop/stall.html
@@ -3,7 +3,7 @@
   <div class="col-12 q-gutter-y-md">
     <q-toolbar class="row">
       <div class="col">
-        <q-toolbar-title> {{ stall.name }} </q-toolbar-title>
+        <q-toolbar-title> Stall: {{ stall.name }} </q-toolbar-title>
       </div>
       <div class="col q-mx-md">
         <q-input

From 9291b54ef77dcbde51d9cf8a831941dbbad6902e Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 4 Jan 2023 11:16:20 +0000
Subject: [PATCH 169/174] mypyfication and format

---
 lnbits/extensions/shop/crud.py      |   9 +--
 lnbits/extensions/shop/tasks.py     |   2 +-
 lnbits/extensions/shop/views.py     |  32 ++++++---
 lnbits/extensions/shop/views_api.py | 105 +++++++++++++++-------------
 4 files changed, 84 insertions(+), 64 deletions(-)

diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/shop/crud.py
index 2411fd38..c58dfb3e 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/shop/crud.py
@@ -209,7 +209,7 @@ async def delete_shop_stall(stall_id: str) -> None:
 ###Orders
 
 
-async def create_shop_order(data: createOrder, invoiceid: str) -> Orders:
+async def create_shop_order(data: createOrder, invoiceid: str):
     returning = "" if db.type == SQLITE else "RETURNING ID"
     method = db.execute if db.type == SQLITE else db.fetchone
 
@@ -234,9 +234,6 @@ async def create_shop_order(data: createOrder, invoiceid: str) -> Orders:
         return result._result_proxy.lastrowid
     else:
         return result[0]
-    # link = await get_shop_order(link.id)
-    # assert link, "Newly created link couldn't be retrieved"
-    # return link
 
 
 async def create_shop_order_details(order_id: str, data: List[createOrderDetails]):
@@ -278,7 +275,7 @@ async def get_shop_order_invoiceid(invoice_id: str) -> Optional[Orders]:
     return Orders(**row) if row else None
 
 
-async def set_shop_order_paid(payment_hash: str) -> Orders:
+async def set_shop_order_paid(payment_hash: str):
     await db.execute(
         """
             UPDATE shop.orders
@@ -380,7 +377,7 @@ async def create_shop_market(data: CreateMarket):
     return market
 
 
-async def create_shop_market_stalls(market_id: str, data: List[CreateMarketStalls]):
+async def create_shop_market_stalls(market_id: str, data: List[str]):
     for stallid in data:
         id = urlsafe_short_hash()
 
diff --git a/lnbits/extensions/shop/tasks.py b/lnbits/extensions/shop/tasks.py
index 0e742466..3dc460aa 100644
--- a/lnbits/extensions/shop/tasks.py
+++ b/lnbits/extensions/shop/tasks.py
@@ -23,7 +23,7 @@ async def wait_for_paid_invoices():
 
 
 async def on_invoice_paid(payment: Payment) -> None:
-    if payment.extra.get("tag") != "shop":
+    if payment.extra and payment.extra.get("tag") != "shop":
         return
 
     order = await get_shop_order_invoiceid(payment.payment_hash)
diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/shop/views.py
index 8dad15ae..309ed134 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/shop/views.py
@@ -2,8 +2,14 @@ import json
 from http import HTTPStatus
 from typing import List
 
-from fastapi import BackgroundTasks, Query, Request, WebSocket, WebSocketDisconnect
-from fastapi.params import Depends
+from fastapi import (
+    BackgroundTasks,
+    Depends,
+    Query,
+    Request,
+    WebSocket,
+    WebSocketDisconnect,
+)
 from fastapi.templating import Jinja2Templates
 from loguru import logger
 from starlette.exceptions import HTTPException
@@ -42,6 +48,7 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
             user=user.id, data=SetSettings(currency="sat", fiat_base_multiplier=1)
         )
         settings = await get_shop_settings(user.id)
+    assert settings
     return shop_renderer().TemplateResponse(
         "shop/index.html",
         {"request": request, "user": user.dict(), "currency": settings.currency},
@@ -52,26 +59,28 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 async def stall(request: Request, stall_id):
     stall = await get_shop_stall(stall_id)
     products = await get_shop_products(stall_id)
-    zones = []
-    for id in stall.shippingzones.split(","):
-        z = await get_shop_zone(id)
-        z = z.dict()
-        zones.append({"label": z["countries"], "cost": z["cost"], "value": z["id"]})
 
     if not stall:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Stall does not exist."
         )
 
-    stall = stall.dict()
+    zones = []
+    for id in stall.shippingzones.split(","):
+        zone = await get_shop_zone(id)
+        assert zone
+        z = zone.dict()
+        zones.append({"label": z["countries"], "cost": z["cost"], "value": z["id"]})
 
-    stall["zones"] = zones
+    _stall = stall.dict()
+
+    _stall["zones"] = zones
 
     return shop_renderer().TemplateResponse(
         "shop/stall.html",
         {
             "request": request,
-            "stall": stall,
+            "stall": _stall,
             "products": [product.dict() for product in products],
         },
     )
@@ -109,9 +118,12 @@ async def order_chat(
     keys: str = Query(None),
 ):
     stall = await get_shop_stall(merch)
+    assert stall
     order = await get_shop_order_invoiceid(invoice_id)
+    assert order
     _order = await get_shop_order_details(order.id)
     products = await get_shop_products(stall.id)
+    assert products
 
     return shop_renderer().TemplateResponse(
         "shop/order.html",
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/shop/views_api.py
index bc098dee..87374b20 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/shop/views_api.py
@@ -3,11 +3,8 @@ from http import HTTPStatus
 from typing import List, Union
 from uuid import uuid4
 
-from fastapi import Request
-from fastapi.param_functions import Body, Query
-from fastapi.params import Depends
+from fastapi import Body, Depends, Query, Request
 from loguru import logger
-from secp256k1 import PrivateKey, PublicKey
 from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
@@ -63,6 +60,7 @@ from .crud import (
 )
 from .models import (
     CreateMarket,
+    CreateMarketStalls,
     Orders,
     Products,
     SetSettings,
@@ -86,7 +84,8 @@ async def api_shop_products(
     wallet_ids = [wallet.wallet.id]
 
     if all_stalls:
-        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+        user = await get_user(wallet.wallet.user)
+        wallet_ids = user.wallet_ids if user else []
 
     stalls = [stall.id for stall in await get_shop_stalls(wallet_ids)]
 
@@ -106,7 +105,11 @@ async def api_shop_product_create(
     # For fiat currencies,
     # we multiply by data.fiat_base_multiplier (usually 100) to save the value in cents.
     settings = await get_shop_settings(user=wallet.wallet.user)
+    assert settings
+
     stall = await get_shop_stall(stall_id=data.stall)
+    assert stall
+
     if stall.currency != "sat":
         data.price *= settings.fiat_base_multiplier
 
@@ -122,7 +125,7 @@ async def api_shop_product_create(
         product = await update_shop_product(product_id, **data.dict())
     else:
         product = await create_shop_product(data=data)
-
+    assert product
     return product.dict()
 
 
@@ -136,6 +139,8 @@ async def api_shop_products_delete(
         return {"message": "Product does not exist."}
 
     stall = await get_shop_stall(product.stall)
+    assert stall
+
     if stall.wallet != wallet.wallet.id:
         return {"message": "Not your Shop."}
 
@@ -201,7 +206,8 @@ async def api_shop_stalls(
     wallet_ids = [wallet.wallet.id]
 
     if all_wallets:
-        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+        user = await get_user(wallet.wallet.user)
+        wallet_ids = user.wallet_ids if user else []
 
     return [stall.dict() for stall in await get_shop_stalls(wallet_ids)]
 
@@ -225,7 +231,7 @@ async def api_shop_stall_create(
         stall = await update_shop_stall(stall_id, **data.dict())
     else:
         stall = await create_shop_stall(data=data)
-
+    assert stall
     return stall.dict()
 
 
@@ -254,16 +260,17 @@ async def api_shop_orders(
 ):
     wallet_ids = [wallet.wallet.id]
     if all_wallets:
-        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
+        user = await get_user(wallet.wallet.user)
+        wallet_ids = user.wallet_ids if user else []
 
     orders = await get_shop_orders(wallet_ids)
     if not orders:
         return
     orders_with_details = []
     for order in orders:
-        order = order.dict()
-        order["details"] = await get_shop_order_details(order["id"])
-        orders_with_details.append(order)
+        _order = order.dict()
+        _order["details"] = await get_shop_order_details(_order["id"])
+        orders_with_details.append(_order)
     try:
         return orders_with_details  # [order for order in orders]
         # return [order.dict() for order in await get_shop_orders(wallet_ids)]
@@ -273,10 +280,12 @@ async def api_shop_orders(
 
 @shop_ext.get("/api/v1/orders/{order_id}")
 async def api_shop_order_by_id(order_id: str):
-    order = (await get_shop_order(order_id)).dict()
-    order["details"] = await get_shop_order_details(order_id)
+    order = await get_shop_order(order_id)
+    assert order
+    _order = order.dict()
+    _order["details"] = await get_shop_order_details(order_id)
 
-    return order
+    return _order
 
 
 @shop_ext.post("/api/v1/orders")
@@ -336,18 +345,18 @@ async def api_shop_order_delete(
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
-@shop_ext.get("/api/v1/orders/paid/{order_id}")
-async def api_shop_order_paid(
-    order_id, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-    await db.execute(
-        "UPDATE shop.orders SET paid = ? WHERE id = ?",
-        (
-            True,
-            order_id,
-        ),
-    )
-    return "", HTTPStatus.OK
+# @shop_ext.get("/api/v1/orders/paid/{order_id}")
+# async def api_shop_order_paid(
+#     order_id, wallet: WalletTypeInfo = Depends(require_admin_key)
+# ):
+#     await db.execute(
+#         "UPDATE shop.orders SET paid = ? WHERE id = ?",
+#         (
+#             True,
+#             order_id,
+#         ),
+#     )
+#     return "", HTTPStatus.OK
 
 
 @shop_ext.get("/api/v1/order/pubkey/{payment_hash}/{pubkey}")
@@ -375,33 +384,33 @@ async def api_shop_order_shipped(
 ###List products based on stall id
 
 
-@shop_ext.get("/api/v1/stall/products/{stall_id}")
-async def api_shop_stall_products(
-    stall_id, wallet: WalletTypeInfo = Depends(get_key_type)
-):
+# @shop_ext.get("/api/v1/stall/products/{stall_id}")
+# async def api_shop_stall_products(
+#     stall_id, wallet: WalletTypeInfo = Depends(get_key_type)
+# ):
 
-    rows = await db.fetchone("SELECT * FROM shop.stalls WHERE id = ?", (stall_id,))
-    if not rows:
-        return {"message": "Stall does not exist."}
+#     rows = await db.fetchone("SELECT * FROM shop.stalls WHERE id = ?", (stall_id,))
+#     if not rows:
+#         return {"message": "Stall does not exist."}
 
-    products = db.fetchone("SELECT * FROM shop.products WHERE wallet = ?", (rows[1],))
-    if not products:
-        return {"message": "No products"}
+#     products = db.fetchone("SELECT * FROM shop.products WHERE wallet = ?", (rows[1],))
+#     if not products:
+#         return {"message": "No products"}
 
-    return [products.dict() for products in await get_shop_products(rows[1])]
+#     return [products.dict() for products in await get_shop_products(rows[1])]
 
 
 ###Check a product has been shipped
 
 
-@shop_ext.get("/api/v1/stall/checkshipped/{checking_id}")
-async def api_shop_stall_checkshipped(
-    checking_id, wallet: WalletTypeInfo = Depends(get_key_type)
-):
-    rows = await db.fetchone(
-        "SELECT * FROM shop.orders WHERE invoiceid = ?", (checking_id,)
-    )
-    return {"shipped": rows["shipped"]}
+# @shop_ext.get("/api/v1/stall/checkshipped/{checking_id}")
+# async def api_shop_stall_checkshipped(
+#     checking_id, wallet: WalletTypeInfo = Depends(get_key_type)
+# ):
+#     rows = await db.fetchone(
+#         "SELECT * FROM shop.orders WHERE invoiceid = ?", (checking_id,)
+#     )
+#     return {"shipped": rows["shipped"]}
 
 
 ##
@@ -426,7 +435,7 @@ async def api_shop_market_stalls(market_id: str):
 
 @shop_ext.post("/api/v1/markets")
 @shop_ext.put("/api/v1/markets/{market_id}")
-async def api_shop_stall_create(
+async def api_shop_market_create(
     data: CreateMarket,
     market_id: str = None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
@@ -443,6 +452,7 @@ async def api_shop_stall_create(
     else:
         market = await create_shop_market(data=data)
 
+    assert market
     await create_shop_market_stalls(market_id=market.id, data=data.stalls)
 
     return market.dict()
@@ -494,6 +504,7 @@ async def api_set_settings(
             return {"message": "Not your Shop."}
 
         settings = await get_shop_settings(user=usr)
+        assert settings
 
         if settings.user != wallet.wallet.user:
             return {"message": "Not your Shop."}

From 7328d222a08ee66116d8322712a35e419fe10182 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Wed, 4 Jan 2023 11:28:43 +0000
Subject: [PATCH 170/174] prusnak's suggestion

---
 lnbits/extensions/shop/tasks.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lnbits/extensions/shop/tasks.py b/lnbits/extensions/shop/tasks.py
index 3dc460aa..621e4fae 100644
--- a/lnbits/extensions/shop/tasks.py
+++ b/lnbits/extensions/shop/tasks.py
@@ -23,7 +23,10 @@ async def wait_for_paid_invoices():
 
 
 async def on_invoice_paid(payment: Payment) -> None:
-    if payment.extra and payment.extra.get("tag") != "shop":
+    if not payment.extra:
+        return
+
+    if payment.extra.get("tag") != "shop":
         return
 
     order = await get_shop_order_invoiceid(payment.payment_hash)

From 4a86acf8797df5cbe382e509d1a8914e7bd4868e Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Wed, 4 Jan 2023 20:45:30 +0000
Subject: [PATCH 171/174] Added tile

---
 lnbits/extensions/shop/config.json               |   2 +-
 .../shop/static/images/bitcoin-shop.png          | Bin 0 -> 6034 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 lnbits/extensions/shop/static/images/bitcoin-shop.png

diff --git a/lnbits/extensions/shop/config.json b/lnbits/extensions/shop/config.json
index 90f117dd..eba0def9 100644
--- a/lnbits/extensions/shop/config.json
+++ b/lnbits/extensions/shop/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Shop",
   "short_description": "Make a webshop on LNbits",
-  "icon": "add_shopping_cart",
+	"tile": "/shop/static/images/bitcoin-shop.png",
   "contributors": ["benarc", "talvasconcelos"]
 }
diff --git a/lnbits/extensions/shop/static/images/bitcoin-shop.png b/lnbits/extensions/shop/static/images/bitcoin-shop.png
new file mode 100644
index 0000000000000000000000000000000000000000..debffbb28586737964b97aa788242ebf68ded85e
GIT binary patch
literal 6034
zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+TQZ%U13aCb6$*;-(=u~X
z85lGs)=sqbI2<6->VLUQNtE5V!y;vcpO}lQ%vLVf6#`kUVX{7Pzu0}HCW(l<AKd!j
z!TF@C2aiUEvxhqh{9!CCEetA|DD>W&OE+oHhYI=UcZ)0D+c{)}%*b;;#(1}2O^K0W
zYVqoz@7his4lN9xiQ6pIPiwMVyKY+=eD`Q&Si$}ISC>D{WouD+6qy#q_mS=6mu1OC
z_teEAJuh~g?>w%vOW~vP_0akEEyQibDwbuWUiy4QX=BKngsshyCogp_??|4N7qD-_
z*T~0vjz+G(67hQ8pVo_eHf}mo8g<wsNzi+OqN6KsYRCfxzuk^qy(V+jnf^G>i&vZO
zwa!SwQY@gA@95{|{|DdSyw!S=(_V8H!>+iP@5wAL?y=4)z5ds(?Cvv8fjYKzJ=^x*
zVo0;|T)%zm4Z#chd1GR>o0jtLxWmXc-{)wMji!&chDgJA<6p~U3<|ivtovD<J@@e!
z#uFFT1eqT=sAv$i<jvQH^6w?*-rk>g?N1#8%lD#cMU~m&3=9lxN#5=*4F5rJ!QSPQ
z85kHi3p^r=85s1GL71^(seKs(0|R@Br>`sfb4C^s9lh@OpbZQR43Z_T5hc#~xw)x%
zB@E6*sfi`2DGKG8B^e6tp1uL$jeOz^45C?{E{-7;x8BaJE{M5Wd))r{z1{k6*WL4v
zF8VVmRr<79i=oJEiw4esprA`ZPC-tyP6{+#o^~No$Y}1Q6r)VfSw5eegeGlS>N9KG
z<Ru5&5||{8A3V4%=`_df6PsE$$Zeaq`_jJh_j{MupP06l-+Q-_!cDvTGygt+_iktU
z`S-<j&%axLe`DEnNF{LAYoYhY+NVC$50Ypx`m>a`$wL0|@4t06a{XENB13e<ltsAC
zN-!A;g9OENqmF!fdV1yBwXT;<Qad9j<lg@B?c1e`7ac8R(h3R+tR!6Q7*4F@xqsuv
ziA|}eBX$<4t`1+nY~e!2*y~eG(;TOzUc7qs=)=S9oUKk<wr{_D@uFjS`S%coj+G1+
z%Rf%njXrj3Yj)(`D$}!P&+5ePnzCz`m6x}-pp!=SnWiOEdU|>cOiWyC<eq<ccv!}|
ztjD(c+lKu6c5G~H%UTbdIR2wsTtDsdGT)qgduE2N4hswqclY${Ec&}y_9myJt1GLh
zsOXJtzPY)&+1J)AT)2>N`|Y#qVt1coZM0!-G`#C8rXP2P*Zj_bv*!2DTn&%+_4Vy7
z`dJ(>Ygu4$uybgrsNMYhLvH$eJ{+1-*k~8}etyoM)$4Y3-MST(`iJ{~_KzC7Q>RaV
ztgu-Uq*+x}<)Jotru<){52DGd4C^m1^A$c8Zu@^O{{yB*hGm)0Op+=qE&1A$-BMrg
zI``-2=bKwHFSnH6*jb!@?%{zGSAYMlv(LW1F7@-Xv!~wf_wG9W*yit-%Oz!HX?vfS
z?XG;Wuzkg<RkI3z?phZd9)5i5^|<cb+jFc+U(I1iS-ElJ#H*{rH)mbdO8rxA*#7>-
ziw7Hz%bl*ue|l<a&A-p{?cY~Rv^mDc%7({Ps_N?Me);w-jY)lL%-;H&n^H~8&4a_k
zm-qbFTVD8n8_(ed+qO;Pl{VXua&pp}2Zo;yEpqJ!#i{pny`@W*xJ15G;^5jFr|;|Q
z8xj)Y!`pEGefrN&PuIllowaM1)zs(lDwj%S=bu0R=jZ3;YzH2H42X{Qc6Mf7x^(HP
zr+SMln>KASTDSArte5Q!zLzhQ#`?aGOJVp?V<)B;V`0nSC7!P{A=@LIA?A@}JJW+8
zdASf_4TdQq3|?FeODzSbJpKL8TGe@G(z8vuv;Y08Yin!cGK)|VO01}`cwYUnVve$V
zpMi-<NWok$FRvBr*Ps6_*~j$2CS{h|?(+A~{{4PGKkIMo!B=nIq<nsMmbHHUu3fX%
z*L_`G^GJC9iRzvEq?kf@7A#>12x8FCWSFAoxKigqO;!K0z}VQc({!V`{FsG1S#EF7
zPyhe#Z{+)*f9u}u{T}zHuHG?~OL4{e_4*l#{Y)SYi5n6Rvt3&sAOE4;d7;3;1Os&j
zUS3|C9}k+ZT)QR~vrb^qf~_)K4WC06^4i_3_6dJiy-~&gD1#P9NDzYt$j+2mYHf)H
z8y0t;yH^)9t@5O4%Ea48+1Ew1UVrQ4Re4ZnrM*6b&*>xsgJbb_zby9VZ@c)lOuS5|
z$n%|!YRTMJudHUxnziG*{=XjU{5uU(iq5THXO?#FwQgM1+SY#CU$t)0Wr@6B8gh#@
z^L4IOe^IE_-M_f>e)gZcyZA4B>W^QrY)^`xvw<>$&h514@_a?tukZ6sIBq<lXZ1l5
z2d@;JBPR}CztGOM<ItuTRgYd<^zNLUdp={qCDY#i`tSES-_-?5{*RfvWc%cU)3<-x
ze*eG!B+bu{J~9M(#Z^DnIJwRC#08IMZ&;Ze?W8Aosd!kkPdb_t6X=*cl{t4-(jm^1
z=WjU)ylX$RGD1<H@>A`(T>(dSJq=y6qVVC2Wh)ATK5cdul(01ooObi8+U;%s<nRAE
z6Kf%R>?osyQR*lD{{PYk&wb<Bo)8ce?C&FSnOQ;gDPIR$yQDO)kJjPy`|kuEa$nE0
zp!4PGH1Ctj<}-8tIPy9(FIRI<d2v+qMVviHZq(=7CoQhMFffvwU2^x}_J4aic3*S7
z@b$zNkJ~|?POz(%|KHL$?b~+sb@OxVk1XH+H+kN_N3{~gAJ%_kWqwd(m0^Fav1eJn
zO-M{s-$VVwPYWiyXDgnO$Y|VhdVAcnhp$xQvbuJE?o;iSagEu$VOF{tqk@U--T0o>
zJD5yzXZ;OO)zkJ2YTo$o-WG*zm!>aSXENn&?74-Tl<eboT|Dl7>!^$6wFG_Vxo=g1
zpSAKgOqo>w@8x=nuirkFOxI+Yb-Vjn$->Ob|2?+rc^o+$xjS4}XS&IhlTAXLiY#^E
zZu;Vn1vp}zp9ISLGM{}Y!Jhi)p4tfy$H?Ab{^F;9@;-z)KKUYbFr?}F?c1KS#9Sr6
zu3NL_$+z42{_mx?^`3rOb^e(k7n1{r<8A5u1ir7!<FE6WOlS8s|CFWQ*}LUzPht3j
z@|jb1B)2|)@O*YEC+|YZ$A??DsAbLE6ni7cU3p5r_`$a&A6}Lo{gZM0KubI4mw6Ao
z`|Xb=^WQDsCcNYBo!akrRfIa{yp4&8u`zFNxWA`PLg^*%BYkami`XN%*8PU!i%yDk
zW|;hy+?DpA*!rWD|DNZ;oK6`WcO5d=E^Sj=$M14Vve#O(xc!sf>Lba8$D_LC-x?g-
z%aOp|F8Su2SANCegqN3=KL2<5S@jb}u3e}3>vzsgxX+oQHSgWOxp^jsXHNgfXk%4T
zI`J7}j30CRWozxn31>D5?qaN}s(-=B#S|ELL6FB!*<)@!i-z^<Ys$$v^?wB#15{Qo
z&z?2yv#I)XM!x+&)mAS2XL6YHtiz5wDk+TV{t;$nS~JCBboDOJjDI$3u7?N1E<3)1
zDz@b+j`0f)RPu4A#@W}`K3;OwCT-G@m2!1I?Dy~5pxzXB<9?g0gpcu@{abj>zGSpL
zKPS46-D+V$RsM=ES!eWT&y9)X=$&ykli^&`ol+w|o5%{Epm3pt;^YT8kwHm(^B%QM
zyT&cvuzdU86P@q$QfwyK-F#HCP}0w3-aGls=G4CZYRnI=M~0kSW9#+7O7_Q|c|7Iw
zohHmV=#$AZ|2F5bC5Z|m5BOz|TVA?aoXBKgX5;WErF_@JmcHY!-9?P9>pDiM`EYF$
zXxgOI%=Uj`WH!gb*N+Q*qHbj*-b_;4XvDpG&z<_WOOEJIRk(He<omeW)ejj3cwB#c
zD&Buo>Wz24NqhH{v?o)u{pWcXWG!*M&Cz%vhQqMC_?Z)P?D-i-O)9ImbOkKh^}r&*
z@uo!fGgXV-^5!%C?ydRRdOyB`;f?JNwu|$&PuN%x^&})Fsx8f;GrEkiH(9v<sM^!p
z53ZPW-O1y!`S?b*pZP*h&%!fl*9#98?D(+a&V{xWTHiLUc$Q<Jaonxr%bug!)%-CL
z40~>UQ|r99t|$LhhM)PN0x=We;71m7v;DbLPTNX#ua4P#OTaL?kG)Y+^Txb;A{(Ea
zvAH~pP5rw5+%1o{=L)`lnH2x~BR6})<GZys8?*JFofMXQcfa@9CjotxjLDN+j3!QH
zydv^CX0waI?9*y256X6aNI!ExwpQEml$Y4MIVyYB=QR8(Vpg-g;q`Uy1MA)2CeKjr
z?^w>NAS0!G>+;lpcj7r(F83Df5SXR0A~fgrxl;^XcbihDDxZ0krKITL*`czQr+*s5
z%vpgGcZsD0mKye6P2W3PMpot4?V}gZt>b2HNRQ?dw!S#?>A!C8E<rwb$H&`j<}&`6
z^U`tgI%yHfznkw#=q)d{5%oD=Zy~u#F>{)D+=7<b;j?1m-uq-P_XuYXyu8nVp`z$|
z+?rrpNyg2M$6ud*eKNkP+G9zopp^946|LPnH%v3=RLGjdxYhUggvmQBH($11wI}w6
zO`pm7Nw2DB*Z=ximZSOHj^W`$#uTGjWoP4KoP>HS8to4(=G<^*3%kOshRUb+EH@Sy
z<$2b)&RetK+m8vZMQyfW9J6<Q3hJ6Wd6t#Yv3ck8+M1J#<r_ZM#4hWdD$#ejzmD5@
z)|T8QbG@|BFXhb3)N}5bsXJ|g&(^rb8-7)m$R=87oU>4Wxb&QeXK|Y2Y=*pumx~wr
z%r+6Zbz|Ag&wCbpk2-c{1>5q&8a0zbqHd&V^{P8J{|b`MZR2zB^1MG|uJr?rf{4zW
zW}ebQ7r(GO<Q`w_Vfp#!dcC_&;?IvhdvlIC#cYj9u*c;y)hn;ud>=W%Ynh~*SBDC>
zwpJ`B-#0d6n_f>rvv-mKPffSHITg{&l63XPB~xYot*<lYOqQH*ZfZT34|l_}f>hh*
z{JnijXHy(`-&{JN=zFZ`<!gq;VmY;kk4$Ur-?+`h!e|3ewodYX+uLb5IU<?MxIQt-
z@xF19$xK~VE4F@btk<QIa~VBWx5N_+tX>N4dg%1M;`rm<oqP@JH%UG8yuZ?Emgl16
z#S%vL`VX#|z6qK1B0?dX@4&Q4&at&Flcu(Quf6=Bdi@cOrJEjZT%5S3f+c+3!KG7#
zwB@APOFk8Mb>^&?|AI#?|KEk}UGFBQ+>+v2yJnKRU5Ra7{>3}&4{n#=ZChNIm}YYP
z#s!9p8yWQ8Xet(DOYvm}rl@XM{BVx#rpF;O<lpJ3B|h7)q>)<v^XqKiH@3I>=RW>+
z$;ZITq(in};qA)3-O<87T6-t<B)A?c`ZupRmf7a&rYR9x|C_fwTGsrWZ%)$ljRm`w
zM{b&v`gzq1?pb0DOSg*tkkUUrOL_WAi-W<nGZrfN-9Do0va4{Z%Pp}otv*pcAsGwL
z43i0;<^C=d*?*(FD_%a*!6ek^D}$!OG_Az<oveRepS~+2-8EnP=>aZQ19$g=Wl4|w
z7Z~$utLCY+%{;)x+QHU#z-!*&+c*AHxU27fJI7xo(lGahyyvdUq;TDS8*%U7=@ULo
zdlbE+N3>h~94AA`vGWsT`5X4c&6+(sa(CI=BmYcPkJdFgJANxINn$tJ=4={#BsoxK
zSKH|e2euh5>CKCNv8{7jPjVZxihH{xx6j`9x%mbMI}?THFYof2FT7s3rL2nY-<Q+V
z>iqh`HvIL_jIS?i3BR>`rrk8Nj~OiO%Mv*ZSVUe*`Kip%G%@a+*d@%#XHc|hwu^~P
zsw}&cX54$fptu<K%87mF*DAUwt?io@>*Bv*QoKyT=biK29G5-+HP1BsV>A1<g3{v4
z)ma&*H%Z9IJn2-Qr=i1JVku+u<)rn`ep_}4sdvZu_?Df2tE$BEdzXZ)-l6y39~bUq
zl;C0eXjyWsNjWq5m8AW~q_d(&9u@Ao#qYo8`|rn&b@g{19h|MTV_)E-vK<#p%(v+_
zN^D#*S-gMO&vW^|6z?y+we92!2mM15PCINurcP}VP!Zxh^pL|y(s|a-%M)g~p8l{)
zwnWa-r10(6d4cchjE+u|UbQ2Yb%!ip$zF-mU5!2hey?mkw{_3|^G&76MQYx$CO5mU
z>f4K6|N3q`y+kc>+SRL9KQ*$;O<22jtx@oLIU6N!vw9b<_?dJ5%$>Q%Y~L;WkGo#}
z{8n6ZPIaM6P>AkAFQ<(x&n-{ydAf4?(_`VkpX&PWo#QThWXgN-=~I_qExf#La`5$w
z;kpZ*n(7zzDLt->D%~6N_v7zWlX(+1FLY5-<d?CS@KyTLJoX*Cc6R3H{p6WCeLb`L
z!=D=jnnG7!-|+G3mv+0rdd=DKRo$DqPObSP=cZ`Iz{8Y0A^DZ3u}n_gN8Ll-deZZE
z#T7|j-+QS!&0<-i-S$`Fd-_dpUz)z`=B#6-*42eoT}9UoZ5VjwfAc!I#=7HCk<_*O
z2Uh#nard9LTwYawk0HaU;QZR_pBH|;u29n|qp2OSu}D?E=FRjew*Q>oF`SM)vMQZ#
z<H!7cXZHO3TIuV$%f@xh?#GkY+`s9pbl70o;e)^C+JXcuV&3f$TeBzsq0+kA57|1u
z*5Aqg=5zSLD)IYCm&Nxvrk46T23uA|s?NS1+j{<S+PaksRwlGBeEjj3z^;jR+fACg
zR%x{~B<-L7Y1!70x*u{bS8Wc3e(rcy+-z-sdXlyM=~<0(YlM$W{5*S}vs_M1sP{q9
zt`AqwEPk}C|4~e#WoK7ZP~Xbx$*&vTZ<gFwwrFxz>6b~U_<g>EXP$~w@5AqvAN4Yp
zJes!qg1C-qOziyYQzq8lwq3L1tz1oQzF_|C(+}3y9eVLXBKe`fv`j%hwoSG@hYx<8
z9)B$63eP;&l>h(t7asM>s^6mgdh$fcFs+za{;OXr*8O3SODH-v=ZvL*k748!J*B|i
z3|Zn2_P;xvlDAK4cBbre-KNTJjomNLdH!dVy1wqKX=HAiMDb^lZ{<(yJ+}J4b9lKX
zET--$Yw-2*XZ{(lW;`^}t@%+sU4p^urKQ`%c*X+H*GyKGv5W<s-i!-iT}*JlR+Y73
z5|e``BckU?ny_9O!zOc%z*9Mk0zN!qb>Px{JtZK&z$3DDQr+K|_Ge!ii}NyUJIuQ7
z%iVSJ_J1|%ii!`N#-4P)g5gke=Jk^G^G{FLo%wawQ>#^W*^@O+Z`z>4t(khwP|t~D
zU)lTPH~+mcE-5WvvUhv!Y4<5#i%-6MwrSZ@6SFJlvP^SsAKSEMrLBXG*yAIe!X+go
z1}0N(uMMB}W9Ig6{TH6=2Oc|n{GWID$M4a0&8g?_X(mof735*d%+8)I)exZJ;_lAw
z-Y1iokdW}FXTMC|ll}7h`j5@dbI;G%vtXNZrGKhLfm!UiPty61``7PeioKjB+VJpU
zVpLSrGI^$5yLV^i<}O{ivh&m_udJ-BO>K=ouTFha@g?z{mVWw!-r5qG*9ZFCo*g=w
zU#!5&uy)6kXH!@IxU>9USAT7Rvftqup^w>_7|Y(@n|ql#<?5Rraf`Ay5}*O1Rjask
zo8uH&woZNe=Et+cE=ipGe(yj3>D$TR<%~O~*fy~+Uf)}9Du1s+l&{@xwQYUT`}_Or
z?cctAYsq-R;$`9;?l(6#x3{&i)!4~@etzEldhz>`mtS}McyxFB>Ur}oIzDR(S}9Un
zTf67WCGRcUwiy{1ObER?XP>4B*T($&c6aj3cdgr;d3l+pqJS3PjAE<gKe@NJZ7h8q
z#wTkv<#Tbm&M#55xiU-woh}k`a%y7T4?k9{Sh3>3>#u3N>|Vv!e?)K3OTE1<cgwbI
zLL4kbF52mg3c?M>0$;v-nc%hbLxs(h>C=NlLRyw(uDX8SF>+dK<}6{``rF%bWh@F5
zroXno{PHrx4=+8ANheioZEYi_wO)RC<ZW591lz84$}Is3XA}?j_w-!2ef#w1^Y-Vj
zt&Ki!`fj=FE2VOc*=t|D%9=H6R>bZy-PhOGr(azadga=+N8f)7Iz5?_7E<*+^|sl;
zgb5EHCYHUwclO`k-<i3&PcJNVZgE<u*=rwquFNl6FK*8aR&KEickY~N<CTuslycIt
z*?DQX<;y8Tr#EF}XD?p5v~}Ayvs<@spTGLL_*S&f+$&nKJ~uP(iHovKZ~OR}(V?+m
nqSU?s1`!VNnGesu_|M31q!OtYvrm<Qfq}u()z4*}Q$iB}P6mOc

literal 0
HcmV?d00001


From a5727a0c929a29af9fe82d68d8ac00680737aaa3 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Wed, 4 Jan 2023 21:08:28 +0000
Subject: [PATCH 172/174] Changed naming to Market and Stall

---
 lnbits/extensions/{shop => market}/README.md  |   4 +-
 .../extensions/{shop => market}/__init__.py   |  22 +-
 lnbits/extensions/market/config.json          |   6 +
 lnbits/extensions/{shop => market}/crud.py    | 184 +++++------
 .../extensions/{shop => market}/migrations.py |  24 +-
 lnbits/extensions/{shop => market}/models.py  |   2 +-
 .../extensions/{shop => market}/notifier.py   |   4 +-
 .../static/images/bitcoin-shop.png            | Bin
 .../static/images/placeholder.png             | Bin
 lnbits/extensions/{shop => market}/tasks.py   |  18 +-
 .../templates/market}/_api_docs.html          |  14 +-
 .../templates/market}/_chat_box.html          |   0
 .../templates/market}/_dialogs.html           |   8 +-
 .../templates/market}/_tables.html            |  10 +-
 .../templates/market}/index.html              |  94 +++---
 .../templates/market}/market.html             |   4 +-
 .../templates/market}/order.html              |  22 +-
 .../templates/market}/product.html            |   0
 .../templates/market}/stall.html              |  12 +-
 lnbits/extensions/{shop => market}/views.py   |  80 ++---
 .../extensions/{shop => market}/views_api.py  | 304 +++++++++---------
 lnbits/extensions/shop/config.json            |   6 -
 22 files changed, 409 insertions(+), 409 deletions(-)
 rename lnbits/extensions/{shop => market}/README.md (54%)
 rename lnbits/extensions/{shop => market}/__init__.py (59%)
 create mode 100644 lnbits/extensions/market/config.json
 rename lnbits/extensions/{shop => market}/crud.py (54%)
 rename lnbits/extensions/{shop => market}/migrations.py (85%)
 rename lnbits/extensions/{shop => market}/models.py (98%)
 rename lnbits/extensions/{shop => market}/notifier.py (95%)
 rename lnbits/extensions/{shop => market}/static/images/bitcoin-shop.png (100%)
 rename lnbits/extensions/{shop => market}/static/images/placeholder.png (100%)
 rename lnbits/extensions/{shop => market}/tasks.py (62%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/_api_docs.html (88%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/_chat_box.html (100%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/_dialogs.html (98%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/_tables.html (97%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/index.html (93%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/market.html (97%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/order.html (95%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/product.html (100%)
 rename lnbits/extensions/{shop/templates/shop => market/templates/market}/stall.html (96%)
 rename lnbits/extensions/{shop => market}/views.py (67%)
 rename lnbits/extensions/{shop => market}/views_api.py (51%)
 delete mode 100644 lnbits/extensions/shop/config.json

diff --git a/lnbits/extensions/shop/README.md b/lnbits/extensions/market/README.md
similarity index 54%
rename from lnbits/extensions/shop/README.md
rename to lnbits/extensions/market/README.md
index 86ac9ed9..22d38e0d 100644
--- a/lnbits/extensions/shop/README.md
+++ b/lnbits/extensions/market/README.md
@@ -1,7 +1,7 @@
-<h1>Shop</h1>
+<h1>Market</h1>
 <h2>A movable market stand</h2>
 Make a list of products to sell, point the list to an relay (or many), stack sats.
-Shop is a movable market stand, for anon transactions. You then give permission for an relay to list those products. Delivery addresses are sent through the Lightning Network.
+Market is a movable market stand, for anon transactions. You then give permission for an relay to list those products. Delivery addresses are sent through the Lightning Network.
 <img src="https://i.imgur.com/P1tvBSG.png">
 
 <h2>API endpoints</h2>
diff --git a/lnbits/extensions/shop/__init__.py b/lnbits/extensions/market/__init__.py
similarity index 59%
rename from lnbits/extensions/shop/__init__.py
rename to lnbits/extensions/market/__init__.py
index 8c85d8b6..3795ec73 100644
--- a/lnbits/extensions/shop/__init__.py
+++ b/lnbits/extensions/market/__init__.py
@@ -7,20 +7,20 @@ from lnbits.db import Database
 from lnbits.helpers import template_renderer
 from lnbits.tasks import catch_everything_and_restart
 
-db = Database("ext_shop")
+db = Database("ext_market")
 
-shop_ext: APIRouter = APIRouter(prefix="/shop", tags=["shop"])
+market_ext: APIRouter = APIRouter(prefix="/market", tags=["market"])
 
-shop_static_files = [
+market_static_files = [
     {
-        "path": "/shop/static",
-        "app": StaticFiles(directory="lnbits/extensions/shop/static"),
-        "name": "shop_static",
+        "path": "/market/static",
+        "app": StaticFiles(directory="lnbits/extensions/market/static"),
+        "name": "market_static",
     }
 ]
 
 # if 'nostradmin' not in LNBITS_ADMIN_EXTENSIONS:
-#     @shop_ext.get("/", response_class=HTMLResponse)
+#     @market_ext.get("/", response_class=HTMLResponse)
 #     async def index(request: Request):
 #         return template_renderer().TemplateResponse(
 #                 "error.html", {"request": request, "err": "Ask system admin to enable NostrAdmin!"}
@@ -28,9 +28,9 @@ shop_static_files = [
 # else:
 
 
-def shop_renderer():
-    return template_renderer(["lnbits/extensions/shop/templates"])
-    # return template_renderer(["lnbits/extensions/shop/templates"])
+def market_renderer():
+    return template_renderer(["lnbits/extensions/market/templates"])
+    # return template_renderer(["lnbits/extensions/market/templates"])
 
 
 from .tasks import wait_for_paid_invoices
@@ -38,6 +38,6 @@ from .views import *  # noqa
 from .views_api import *  # noqa
 
 
-def shop_start():
+def market_start():
     loop = asyncio.get_event_loop()
     loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
diff --git a/lnbits/extensions/market/config.json b/lnbits/extensions/market/config.json
new file mode 100644
index 00000000..b540189e
--- /dev/null
+++ b/lnbits/extensions/market/config.json
@@ -0,0 +1,6 @@
+{
+  "name": "Market",
+  "short_description": "Webmarket on LNbits",
+	"tile": "/market/static/images/bitcoin-shop.png",
+  "contributors": ["benarc", "talvasconcelos"]
+}
diff --git a/lnbits/extensions/shop/crud.py b/lnbits/extensions/market/crud.py
similarity index 54%
rename from lnbits/extensions/shop/crud.py
rename to lnbits/extensions/market/crud.py
index c58dfb3e..6d82b354 100644
--- a/lnbits/extensions/shop/crud.py
+++ b/lnbits/extensions/market/crud.py
@@ -17,7 +17,7 @@ from .models import (
     OrderDetail,
     Orders,
     Products,
-    ShopSettings,
+    MarketSettings,
     Stalls,
     Zones,
     createOrder,
@@ -30,11 +30,11 @@ from .models import (
 ###Products
 
 
-async def create_shop_product(data: createProduct) -> Products:
+async def create_market_product(data: createProduct) -> Products:
     product_id = urlsafe_short_hash()
     await db.execute(
         f"""
-        INSERT INTO shop.products (id, stall, product, categories, description, image, price, quantity)
+        INSERT INTO market.products (id, stall, product, categories, description, image, price, quantity)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
@@ -48,55 +48,55 @@ async def create_shop_product(data: createProduct) -> Products:
             data.quantity,
         ),
     )
-    product = await get_shop_product(product_id)
+    product = await get_market_product(product_id)
     assert product, "Newly created product couldn't be retrieved"
     return product
 
 
-async def update_shop_product(product_id: str, **kwargs) -> Optional[Products]:
+async def update_market_product(product_id: str, **kwargs) -> Optional[Products]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
 
     await db.execute(
-        f"UPDATE shop.products SET {q} WHERE id = ?",
+        f"UPDATE market.products SET {q} WHERE id = ?",
         (*kwargs.values(), product_id),
     )
-    row = await db.fetchone("SELECT * FROM shop.products WHERE id = ?", (product_id,))
+    row = await db.fetchone("SELECT * FROM market.products WHERE id = ?", (product_id,))
 
     return Products(**row) if row else None
 
 
-async def get_shop_product(product_id: str) -> Optional[Products]:
-    row = await db.fetchone("SELECT * FROM shop.products WHERE id = ?", (product_id,))
+async def get_market_product(product_id: str) -> Optional[Products]:
+    row = await db.fetchone("SELECT * FROM market.products WHERE id = ?", (product_id,))
     return Products(**row) if row else None
 
 
-async def get_shop_products(stall_ids: Union[str, List[str]]) -> List[Products]:
+async def get_market_products(stall_ids: Union[str, List[str]]) -> List[Products]:
     if isinstance(stall_ids, str):
         stall_ids = [stall_ids]
 
-    # with open_ext_db("shop") as db:
+    # with open_ext_db("market") as db:
     q = ",".join(["?"] * len(stall_ids))
     rows = await db.fetchall(
         f"""
-        SELECT * FROM shop.products WHERE stall IN ({q})
+        SELECT * FROM market.products WHERE stall IN ({q})
         """,
         (*stall_ids,),
     )
     return [Products(**row) for row in rows]
 
 
-async def delete_shop_product(product_id: str) -> None:
-    await db.execute("DELETE FROM shop.products WHERE id = ?", (product_id,))
+async def delete_market_product(product_id: str) -> None:
+    await db.execute("DELETE FROM market.products WHERE id = ?", (product_id,))
 
 
 ###zones
 
 
-async def create_shop_zone(user, data: createZones) -> Zones:
+async def create_market_zone(user, data: createZones) -> Zones:
     zone_id = urlsafe_short_hash()
     await db.execute(
         f"""
-        INSERT INTO shop.zones (
+        INSERT INTO market.zones (
             id,
             "user",
             cost,
@@ -108,43 +108,43 @@ async def create_shop_zone(user, data: createZones) -> Zones:
         (zone_id, user, data.cost, data.countries.lower()),
     )
 
-    zone = await get_shop_zone(zone_id)
+    zone = await get_market_zone(zone_id)
     assert zone, "Newly created zone couldn't be retrieved"
     return zone
 
 
-async def update_shop_zone(zone_id: str, **kwargs) -> Optional[Zones]:
+async def update_market_zone(zone_id: str, **kwargs) -> Optional[Zones]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE shop.zones SET {q} WHERE id = ?",
+        f"UPDATE market.zones SET {q} WHERE id = ?",
         (*kwargs.values(), zone_id),
     )
-    row = await db.fetchone("SELECT * FROM shop.zones WHERE id = ?", (zone_id,))
+    row = await db.fetchone("SELECT * FROM market.zones WHERE id = ?", (zone_id,))
     return Zones(**row) if row else None
 
 
-async def get_shop_zone(zone_id: str) -> Optional[Zones]:
-    row = await db.fetchone("SELECT * FROM shop.zones WHERE id = ?", (zone_id,))
+async def get_market_zone(zone_id: str) -> Optional[Zones]:
+    row = await db.fetchone("SELECT * FROM market.zones WHERE id = ?", (zone_id,))
     return Zones(**row) if row else None
 
 
-async def get_shop_zones(user: str) -> List[Zones]:
-    rows = await db.fetchall('SELECT * FROM shop.zones WHERE "user" = ?', (user,))
+async def get_market_zones(user: str) -> List[Zones]:
+    rows = await db.fetchall('SELECT * FROM market.zones WHERE "user" = ?', (user,))
     return [Zones(**row) for row in rows]
 
 
-async def delete_shop_zone(zone_id: str) -> None:
-    await db.execute("DELETE FROM shop.zones WHERE id = ?", (zone_id,))
+async def delete_market_zone(zone_id: str) -> None:
+    await db.execute("DELETE FROM market.zones WHERE id = ?", (zone_id,))
 
 
 ###Stalls
 
 
-async def create_shop_stall(data: createStalls) -> Stalls:
+async def create_market_stall(data: createStalls) -> Stalls:
     stall_id = urlsafe_short_hash()
     await db.execute(
         f"""
-        INSERT INTO shop.stalls (
+        INSERT INTO market.stalls (
             id,
             wallet,
             name,
@@ -166,56 +166,56 @@ async def create_shop_stall(data: createStalls) -> Stalls:
         ),
     )
 
-    stall = await get_shop_stall(stall_id)
+    stall = await get_market_stall(stall_id)
     assert stall, "Newly created stall couldn't be retrieved"
     return stall
 
 
-async def update_shop_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
+async def update_market_stall(stall_id: str, **kwargs) -> Optional[Stalls]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE shop.stalls SET {q} WHERE id = ?",
+        f"UPDATE market.stalls SET {q} WHERE id = ?",
         (*kwargs.values(), stall_id),
     )
-    row = await db.fetchone("SELECT * FROM shop.stalls WHERE id = ?", (stall_id,))
+    row = await db.fetchone("SELECT * FROM market.stalls WHERE id = ?", (stall_id,))
     return Stalls(**row) if row else None
 
 
-async def get_shop_stall(stall_id: str) -> Optional[Stalls]:
-    row = await db.fetchone("SELECT * FROM shop.stalls WHERE id = ?", (stall_id,))
+async def get_market_stall(stall_id: str) -> Optional[Stalls]:
+    row = await db.fetchone("SELECT * FROM market.stalls WHERE id = ?", (stall_id,))
     return Stalls(**row) if row else None
 
 
-async def get_shop_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
+async def get_market_stalls(wallet_ids: Union[str, List[str]]) -> List[Stalls]:
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM shop.stalls WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM market.stalls WHERE wallet IN ({q})", (*wallet_ids,)
     )
     return [Stalls(**row) for row in rows]
 
 
-async def get_shop_stalls_by_ids(stall_ids: Union[str, List[str]]) -> List[Stalls]:
+async def get_market_stalls_by_ids(stall_ids: Union[str, List[str]]) -> List[Stalls]:
     q = ",".join(["?"] * len(stall_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM shop.stalls WHERE id IN ({q})", (*stall_ids,)
+        f"SELECT * FROM market.stalls WHERE id IN ({q})", (*stall_ids,)
     )
     return [Stalls(**row) for row in rows]
 
 
-async def delete_shop_stall(stall_id: str) -> None:
-    await db.execute("DELETE FROM shop.stalls WHERE id = ?", (stall_id,))
+async def delete_market_stall(stall_id: str) -> None:
+    await db.execute("DELETE FROM market.stalls WHERE id = ?", (stall_id,))
 
 
 ###Orders
 
 
-async def create_shop_order(data: createOrder, invoiceid: str):
+async def create_market_order(data: createOrder, invoiceid: str):
     returning = "" if db.type == SQLITE else "RETURNING ID"
     method = db.execute if db.type == SQLITE else db.fetchone
 
     result = await (method)(
         f"""
-            INSERT INTO shop.orders (wallet, shippingzone, address, email, total, invoiceid, paid, shipped)
+            INSERT INTO market.orders (wallet, shippingzone, address, email, total, invoiceid, paid, shipped)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?)
             {returning}
             """,
@@ -236,12 +236,12 @@ async def create_shop_order(data: createOrder, invoiceid: str):
         return result[0]
 
 
-async def create_shop_order_details(order_id: str, data: List[createOrderDetails]):
+async def create_market_order_details(order_id: str, data: List[createOrderDetails]):
     for item in data:
         item_id = urlsafe_short_hash()
         await db.execute(
             """
-            INSERT INTO shop.order_details (id, order_id, product_id, quantity)
+            INSERT INTO market.order_details (id, order_id, product_id, quantity)
             VALUES (?, ?, ?, ?)
             """,
             (
@@ -251,34 +251,34 @@ async def create_shop_order_details(order_id: str, data: List[createOrderDetails
                 item.quantity,
             ),
         )
-    order_details = await get_shop_order_details(order_id)
+    order_details = await get_market_order_details(order_id)
     return order_details
 
 
-async def get_shop_order_details(order_id: str) -> List[OrderDetail]:
+async def get_market_order_details(order_id: str) -> List[OrderDetail]:
     rows = await db.fetchall(
-        f"SELECT * FROM shop.order_details WHERE order_id = ?", (order_id,)
+        f"SELECT * FROM market.order_details WHERE order_id = ?", (order_id,)
     )
 
     return [OrderDetail(**row) for row in rows]
 
 
-async def get_shop_order(order_id: str) -> Optional[Orders]:
-    row = await db.fetchone("SELECT * FROM shop.orders WHERE id = ?", (order_id,))
+async def get_market_order(order_id: str) -> Optional[Orders]:
+    row = await db.fetchone("SELECT * FROM market.orders WHERE id = ?", (order_id,))
     return Orders(**row) if row else None
 
 
-async def get_shop_order_invoiceid(invoice_id: str) -> Optional[Orders]:
+async def get_market_order_invoiceid(invoice_id: str) -> Optional[Orders]:
     row = await db.fetchone(
-        "SELECT * FROM shop.orders WHERE invoiceid = ?", (invoice_id,)
+        "SELECT * FROM market.orders WHERE invoiceid = ?", (invoice_id,)
     )
     return Orders(**row) if row else None
 
 
-async def set_shop_order_paid(payment_hash: str):
+async def set_market_order_paid(payment_hash: str):
     await db.execute(
         """
-            UPDATE shop.orders
+            UPDATE market.orders
             SET paid = true
             WHERE invoiceid = ?
             """,
@@ -286,10 +286,10 @@ async def set_shop_order_paid(payment_hash: str):
     )
 
 
-async def set_shop_order_pubkey(payment_hash: str, pubkey: str):
+async def set_market_order_pubkey(payment_hash: str, pubkey: str):
     await db.execute(
         """
-            UPDATE shop.orders
+            UPDATE market.orders
             SET pubkey = ?
             WHERE invoiceid = ?
             """,
@@ -300,7 +300,7 @@ async def set_shop_order_pubkey(payment_hash: str, pubkey: str):
     )
 
 
-async def update_shop_product_stock(products):
+async def update_market_product_stock(products):
 
     q = "\n".join(
         [f"""WHEN id='{p.product_id}' THEN quantity - {p.quantity}""" for p in products]
@@ -309,7 +309,7 @@ async def update_shop_product_stock(products):
 
     await db.execute(
         f"""
-            UPDATE shop.products
+            UPDATE market.products
             SET quantity=(CASE
                         {q}
                         END)
@@ -319,51 +319,51 @@ async def update_shop_product_stock(products):
     )
 
 
-async def get_shop_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
+async def get_market_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
     if isinstance(wallet_ids, str):
         wallet_ids = [wallet_ids]
 
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM shop.orders WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM market.orders WHERE wallet IN ({q})", (*wallet_ids,)
     )
     #
     return [Orders(**row) for row in rows]
 
 
-async def delete_shop_order(order_id: str) -> None:
-    await db.execute("DELETE FROM shop.orders WHERE id = ?", (order_id,))
+async def delete_market_order(order_id: str) -> None:
+    await db.execute("DELETE FROM market.orders WHERE id = ?", (order_id,))
 
 
 ### Market/Marketplace
 
 
-async def get_shop_markets(user: str) -> List[Market]:
-    rows = await db.fetchall("SELECT * FROM shop.markets WHERE usr = ?", (user,))
+async def get_market_markets(user: str) -> List[Market]:
+    rows = await db.fetchall("SELECT * FROM market.markets WHERE usr = ?", (user,))
     return [Market(**row) for row in rows]
 
 
-async def get_shop_market(market_id: str) -> Optional[Market]:
-    row = await db.fetchone("SELECT * FROM shop.markets WHERE id = ?", (market_id,))
+async def get_market_market(market_id: str) -> Optional[Market]:
+    row = await db.fetchone("SELECT * FROM market.markets WHERE id = ?", (market_id,))
     return Market(**row) if row else None
 
 
-async def get_shop_market_stalls(market_id: str):
+async def get_market_market_stalls(market_id: str):
     rows = await db.fetchall(
-        "SELECT * FROM shop.market_stalls WHERE marketid = ?", (market_id,)
+        "SELECT * FROM market.market_stalls WHERE marketid = ?", (market_id,)
     )
 
     ids = [row["stallid"] for row in rows]
 
-    return await get_shop_stalls_by_ids(ids)
+    return await get_market_stalls_by_ids(ids)
 
 
-async def create_shop_market(data: CreateMarket):
+async def create_market_market(data: CreateMarket):
     market_id = urlsafe_short_hash()
 
     await db.execute(
         """
-            INSERT INTO shop.markets (id, usr, name)
+            INSERT INTO market.markets (id, usr, name)
             VALUES (?, ?, ?)
             """,
         (
@@ -372,18 +372,18 @@ async def create_shop_market(data: CreateMarket):
             data.name,
         ),
     )
-    market = await get_shop_market(market_id)
+    market = await get_market_market(market_id)
     assert market, "Newly created market couldn't be retrieved"
     return market
 
 
-async def create_shop_market_stalls(market_id: str, data: List[str]):
+async def create_market_market_stalls(market_id: str, data: List[str]):
     for stallid in data:
         id = urlsafe_short_hash()
 
         await db.execute(
             """
-            INSERT INTO shop.market_stalls (id, marketid, stallid)
+            INSERT INTO market.market_stalls (id, marketid, stallid)
             VALUES (?, ?, ?)
             """,
             (
@@ -392,21 +392,21 @@ async def create_shop_market_stalls(market_id: str, data: List[str]):
                 stallid,
             ),
         )
-    market_stalls = await get_shop_market_stalls(market_id)
+    market_stalls = await get_market_market_stalls(market_id)
     return market_stalls
 
 
-async def update_shop_market(market_id: str, name: str):
+async def update_market_market(market_id: str, name: str):
     await db.execute(
-        "UPDATE shop.markets SET name = ? WHERE id = ?",
+        "UPDATE market.markets SET name = ? WHERE id = ?",
         (name, market_id),
     )
     await db.execute(
-        "DELETE FROM shop.market_stalls WHERE marketid = ?",
+        "DELETE FROM market.market_stalls WHERE marketid = ?",
         (market_id,),
     )
 
-    market = await get_shop_market(market_id)
+    market = await get_market_market(market_id)
     return market
 
 
@@ -416,7 +416,7 @@ async def update_shop_market(market_id: str, name: str):
 async def create_chat_message(data: CreateChatMessage):
     await db.execute(
         """
-            INSERT INTO shop.messages (msg, pubkey, id_conversation)
+            INSERT INTO market.messages (msg, pubkey, id_conversation)
             VALUES (?, ?, ?)
             """,
         (
@@ -427,44 +427,44 @@ async def create_chat_message(data: CreateChatMessage):
     )
 
 
-async def get_shop_latest_chat_messages(room_name: str):
+async def get_market_latest_chat_messages(room_name: str):
     rows = await db.fetchall(
-        "SELECT * FROM shop.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20",
+        "SELECT * FROM market.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20",
         (room_name,),
     )
 
     return [ChatMessage(**row) for row in rows]
 
 
-async def get_shop_chat_messages(room_name: str):
+async def get_market_chat_messages(room_name: str):
     rows = await db.fetchall(
-        "SELECT * FROM shop.messages WHERE id_conversation = ? ORDER BY timestamp DESC",
+        "SELECT * FROM market.messages WHERE id_conversation = ? ORDER BY timestamp DESC",
         (room_name,),
     )
 
     return [ChatMessage(**row) for row in rows]
 
 
-async def get_shop_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
+async def get_market_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
 
     q = ",".join(["?"] * len(ids))
     rows = await db.fetchall(
-        f"SELECT * FROM shop.messages WHERE id_conversation IN ({q})",
+        f"SELECT * FROM market.messages WHERE id_conversation IN ({q})",
         (*ids,),
     )
     return [ChatMessage(**row) for row in rows]
 
 
-async def get_shop_settings(user) -> Optional[ShopSettings]:
-    row = await db.fetchone("""SELECT * FROM shop.settings WHERE "user" = ?""", (user,))
+async def get_market_settings(user) -> Optional[MarketSettings]:
+    row = await db.fetchone("""SELECT * FROM market.settings WHERE "user" = ?""", (user,))
 
-    return ShopSettings(**row) if row else None
+    return MarketSettings(**row) if row else None
 
 
-async def create_shop_settings(user: str, data):
+async def create_market_settings(user: str, data):
     await db.execute(
         """
-            INSERT INTO shop.settings ("user", currency, fiat_base_multiplier)
+            INSERT INTO market.settings ("user", currency, fiat_base_multiplier)
             VALUES (?, ?, ?)
         """,
         (
@@ -475,10 +475,10 @@ async def create_shop_settings(user: str, data):
     )
 
 
-async def set_shop_settings(user: str, data):
+async def set_market_settings(user: str, data):
     await db.execute(
         """
-            UPDATE shop.settings
+            UPDATE market.settings
             SET currency = ?, fiat_base_multiplier = ?
             WHERE "user" = ?;
         """,
diff --git a/lnbits/extensions/shop/migrations.py b/lnbits/extensions/market/migrations.py
similarity index 85%
rename from lnbits/extensions/shop/migrations.py
rename to lnbits/extensions/market/migrations.py
index e6592dff..72b584f9 100644
--- a/lnbits/extensions/shop/migrations.py
+++ b/lnbits/extensions/market/migrations.py
@@ -1,10 +1,10 @@
 async def m001_initial(db):
     """
-    Initial Shop settings table.
+    Initial Market settings table.
     """
     await db.execute(
         """
-        CREATE TABLE shop.settings (
+        CREATE TABLE market.settings (
             "user" TEXT PRIMARY KEY,
             currency TEXT DEFAULT 'sat',
             fiat_base_multiplier INTEGER DEFAULT 1
@@ -17,7 +17,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE shop.stalls (
+        CREATE TABLE market.stalls (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
@@ -35,7 +35,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE shop.products (
+        CREATE TABLE market.products (
             id TEXT PRIMARY KEY,
             stall TEXT NOT NULL REFERENCES {db.references_schema}stalls (id) ON DELETE CASCADE,
             product TEXT NOT NULL,
@@ -54,7 +54,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE shop.zones (
+        CREATE TABLE market.zones (
             id TEXT PRIMARY KEY,
             "user" TEXT NOT NULL,
             cost TEXT NOT NULL,
@@ -68,7 +68,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE shop.orders (
+        CREATE TABLE market.orders (
             id {db.serial_primary_key},
             wallet TEXT NOT NULL,
             username TEXT,
@@ -92,7 +92,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE shop.order_details (
+        CREATE TABLE market.order_details (
             id TEXT PRIMARY KEY,
             order_id INTEGER NOT NULL REFERENCES {db.references_schema}orders (id) ON DELETE CASCADE,
             product_id TEXT NOT NULL REFERENCES {db.references_schema}products (id) ON DELETE CASCADE,
@@ -106,7 +106,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE shop.markets (
+        CREATE TABLE market.markets (
             id TEXT PRIMARY KEY,
             usr TEXT NOT NULL,
             name TEXT
@@ -119,7 +119,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE shop.market_stalls (
+        CREATE TABLE market.market_stalls (
             id TEXT PRIMARY KEY,
             marketid TEXT NOT NULL REFERENCES {db.references_schema}markets (id) ON DELETE CASCADE,
             stallid TEXT NOT NULL REFERENCES {db.references_schema}stalls (id) ON DELETE CASCADE
@@ -132,7 +132,7 @@ async def m001_initial(db):
     """
     await db.execute(
         f"""
-        CREATE TABLE shop.messages (
+        CREATE TABLE market.messages (
             id {db.serial_primary_key},
             msg TEXT NOT NULL,
             pubkey TEXT NOT NULL,
@@ -149,8 +149,8 @@ async def m001_initial(db):
         Create indexes for message fetching
         """
         await db.execute(
-            "CREATE INDEX idx_messages_timestamp ON shop.messages (timestamp DESC)"
+            "CREATE INDEX idx_messages_timestamp ON market.messages (timestamp DESC)"
         )
         await db.execute(
-            "CREATE INDEX idx_messages_conversations ON shop.messages (id_conversation)"
+            "CREATE INDEX idx_messages_conversations ON market.messages (id_conversation)"
         )
diff --git a/lnbits/extensions/shop/models.py b/lnbits/extensions/market/models.py
similarity index 98%
rename from lnbits/extensions/shop/models.py
rename to lnbits/extensions/market/models.py
index ed6342f0..ea7f6f20 100644
--- a/lnbits/extensions/shop/models.py
+++ b/lnbits/extensions/market/models.py
@@ -4,7 +4,7 @@ from fastapi.param_functions import Query
 from pydantic import BaseModel
 
 
-class ShopSettings(BaseModel):
+class MarketSettings(BaseModel):
     user: str
     currency: str
     fiat_base_multiplier: int
diff --git a/lnbits/extensions/shop/notifier.py b/lnbits/extensions/market/notifier.py
similarity index 95%
rename from lnbits/extensions/shop/notifier.py
rename to lnbits/extensions/market/notifier.py
index 0030001c..e2bf7c91 100644
--- a/lnbits/extensions/shop/notifier.py
+++ b/lnbits/extensions/market/notifier.py
@@ -10,8 +10,8 @@ from collections import defaultdict
 from fastapi import WebSocket
 from loguru import logger
 
-from lnbits.extensions.shop.crud import create_chat_message
-from lnbits.extensions.shop.models import CreateChatMessage
+from lnbits.extensions.market.crud import create_chat_message
+from lnbits.extensions.market.models import CreateChatMessage
 
 
 class Notifier:
diff --git a/lnbits/extensions/shop/static/images/bitcoin-shop.png b/lnbits/extensions/market/static/images/bitcoin-shop.png
similarity index 100%
rename from lnbits/extensions/shop/static/images/bitcoin-shop.png
rename to lnbits/extensions/market/static/images/bitcoin-shop.png
diff --git a/lnbits/extensions/shop/static/images/placeholder.png b/lnbits/extensions/market/static/images/placeholder.png
similarity index 100%
rename from lnbits/extensions/shop/static/images/placeholder.png
rename to lnbits/extensions/market/static/images/placeholder.png
diff --git a/lnbits/extensions/shop/tasks.py b/lnbits/extensions/market/tasks.py
similarity index 62%
rename from lnbits/extensions/shop/tasks.py
rename to lnbits/extensions/market/tasks.py
index 621e4fae..004ebb4d 100644
--- a/lnbits/extensions/shop/tasks.py
+++ b/lnbits/extensions/market/tasks.py
@@ -6,10 +6,10 @@ from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
 
 from .crud import (
-    get_shop_order_details,
-    get_shop_order_invoiceid,
-    set_shop_order_paid,
-    update_shop_product_stock,
+    get_market_order_details,
+    get_market_order_invoiceid,
+    set_market_order_paid,
+    update_market_product_stock,
 )
 
 
@@ -26,17 +26,17 @@ async def on_invoice_paid(payment: Payment) -> None:
     if not payment.extra:
         return
 
-    if payment.extra.get("tag") != "shop":
+    if payment.extra.get("tag") != "market":
         return
 
-    order = await get_shop_order_invoiceid(payment.payment_hash)
+    order = await get_market_order_invoiceid(payment.payment_hash)
     if not order:
         logger.error("this should never happen", payment)
         return
 
     # set order as paid
-    await set_shop_order_paid(payment.payment_hash)
+    await set_market_order_paid(payment.payment_hash)
 
     # deduct items sold from stock
-    details = await get_shop_order_details(order.id)
-    await update_shop_product_stock(details)
+    details = await get_market_order_details(order.id)
+    await update_market_product_stock(details)
diff --git a/lnbits/extensions/shop/templates/shop/_api_docs.html b/lnbits/extensions/market/templates/market/_api_docs.html
similarity index 88%
rename from lnbits/extensions/shop/templates/shop/_api_docs.html
rename to lnbits/extensions/market/templates/market/_api_docs.html
index 3990c301..f0d97dbf 100644
--- a/lnbits/extensions/shop/templates/shop/_api_docs.html
+++ b/lnbits/extensions/market/templates/market/_api_docs.html
@@ -7,7 +7,7 @@
   <q-card>
     <q-card-section>
       <h5 class="text-subtitle1 q-my-none">
-        LNbits Shop (Nostr support coming soon)
+        LNbits Market (Nostr support coming soon)
       </h5>
 
       <ol>
@@ -17,9 +17,9 @@
         <li>Take orders</li>
         <li>Includes chat support!</li>
       </ol>
-      The first LNbits shop idea 'Diagon Alley' helped create Nostr, and soon
-      this shop extension will have the option to work on Nostr 'Diagon Alley'
-      mode, by the merchant, shop, and buyer all having keys, and data being
+      The first LNbits market idea 'Diagon Alley' helped create Nostr, and soon
+      this market extension will have the option to work on Nostr 'Diagon Alley'
+      mode, by the merchant, market, and buyer all having keys, and data being
       routed through Nostr relays.
       <br />
       <small>
@@ -48,7 +48,7 @@
       <q-card-section>
         <code
           ><span class="text-light-blue">GET</span>
-          /shop/api/v1/stall/products/&lt;relay_id&gt;</code
+          /market/api/v1/stall/products/&lt;relay_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <h5 class="text-caption q-mt-sm q-mb-none">
@@ -73,7 +73,7 @@
       <q-card-section>
         <code
           ><span class="text-light-green">POST</span>
-          /shop/api/v1/stall/order/&lt;relay_id&gt;</code
+          /market/api/v1/stall/order/&lt;relay_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <code
@@ -109,7 +109,7 @@
       <q-card-section>
         <code
           ><span class="text-light-blue">GET</span>
-          /shop/api/v1/stall/checkshipped/&lt;checking_id&gt;</code
+          /market/api/v1/stall/checkshipped/&lt;checking_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <h5 class="text-caption q-mt-sm q-mb-none">
diff --git a/lnbits/extensions/shop/templates/shop/_chat_box.html b/lnbits/extensions/market/templates/market/_chat_box.html
similarity index 100%
rename from lnbits/extensions/shop/templates/shop/_chat_box.html
rename to lnbits/extensions/market/templates/market/_chat_box.html
diff --git a/lnbits/extensions/shop/templates/shop/_dialogs.html b/lnbits/extensions/market/templates/market/_dialogs.html
similarity index 98%
rename from lnbits/extensions/shop/templates/shop/_dialogs.html
rename to lnbits/extensions/market/templates/market/_dialogs.html
index d2c22350..d2a8dd0a 100644
--- a/lnbits/extensions/shop/templates/shop/_dialogs.html
+++ b/lnbits/extensions/market/templates/market/_dialogs.html
@@ -184,7 +184,7 @@
     </q-form>
   </q-card>
 </q-dialog>
-<!-- MARKETPLACE/SHOP DIALOG -->
+<!-- MARKETPLACE/market DIALOG -->
 <q-dialog v-model="marketDialog.show" position="top">
   <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
     <q-form @submit="sendMarketplaceFormData" class="q-gutter-md">
@@ -314,8 +314,8 @@
         v-if="diagonAlley"
         filled
         dense
-        v-model.trim="stallDialog.data.nostrShops"
-        label="Nostr shop public keys (seperate by comma)"
+        v-model.trim="stallDialog.data.nostrMarkets"
+        label="Nostr market public keys (seperate by comma)"
       ></q-input>
 
       <div class="row q-mt-lg">
@@ -350,7 +350,7 @@
 <!-- ONBOARDING DIALOG -->
 <q-dialog v-model="onboarding.show">
   <q-card class="q-pa-lg">
-    <h6 class="q-my-md text-primary">How to use Shop</h6>
+    <h6 class="q-my-md text-primary">How to use Market</h6>
     <q-stepper v-model="step" color="primary" vertical animated>
       <q-step
         :name="1"
diff --git a/lnbits/extensions/shop/templates/shop/_tables.html b/lnbits/extensions/market/templates/market/_tables.html
similarity index 97%
rename from lnbits/extensions/shop/templates/shop/_tables.html
rename to lnbits/extensions/market/templates/market/_tables.html
index 15874824..c6fd665b 100644
--- a/lnbits/extensions/shop/templates/shop/_tables.html
+++ b/lnbits/extensions/market/templates/market/_tables.html
@@ -67,7 +67,7 @@
               dense
               size="xs"
               @click="shipOrder(props.row.id)"
-              icon="add_shopping_cart"
+              icon="add_marketping_cart"
               color="green"
             >
               <q-tooltip> Product shipped? </q-tooltip>
@@ -194,7 +194,7 @@
               unelevated
               dense
               size="xs"
-              icon="add_shopping_cart"
+              icon="add_marketping_cart"
               :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
               type="a"
               :href="props.row.wallet"
@@ -276,10 +276,10 @@
               icon="storefront"
               :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
               type="a"
-              :href="'/shop/stalls/' + props.row.id"
+              :href="'/market/stalls/' + props.row.id"
               target="_blank"
             ></q-btn>
-            <q-tooltip> Stall simple UI shopping cart </q-tooltip>
+            <q-tooltip> Stall simple UI marketping cart </q-tooltip>
           </q-td>
           <q-td v-for="col in props.cols" :key="col.name" :props="props">
             {{ col.value }}
@@ -348,7 +348,7 @@
               icon="storefront"
               :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
               type="a"
-              :href="'/shop/market/' + props.row.id"
+              :href="'/market/market/' + props.row.id"
               target="_blank"
             ></q-btn>
             <q-tooltip> Link to pass to stall relay </q-tooltip>
diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/market/templates/market/index.html
similarity index 93%
rename from lnbits/extensions/shop/templates/shop/index.html
rename to lnbits/extensions/market/templates/market/index.html
index 49ddf6fb..e16e5d48 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/market/templates/market/index.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
 %} {% block page %}
 <div class="row q-col-gutter-md">
-  {% include "shop/_dialogs.html" %}
+  {% include "market/_dialogs.html" %}
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section class="q-gutter-sm row">
@@ -60,14 +60,14 @@
           @click="marketDialog.show = true"
           >Create Market
           <q-tooltip>
-            Makes a simple frontend shop for your stalls (not NOSTR)</q-tooltip
+            Makes a simple frontend market for your stalls (not NOSTR)</q-tooltip
           ></q-btn
         >
       </q-card-section>
       <q-separator inset></q-separator>
       <q-card-section>
-        <div class="text-h6">Shop</div>
-        <div class="text-subtitle2">Make a shop of multiple stalls.</div>
+        <div class="text-h6">Market</div>
+        <div class="text-subtitle2">Make a market of multiple stalls.</div>
       </q-card-section>
 
       <q-card-section>
@@ -87,16 +87,16 @@
           class="float-right"
           unelevated
           color="primary"
-          @click="shopDataDownload"
+          @click="marketDataDownload"
           >Export all Data
           <q-tooltip>
-            Export all data (shops, products, orders, etc...)</q-tooltip
+            Export all data (markets, products, orders, etc...)</q-tooltip
           ></q-btn
         >
       </q-card-section>
     </q-card>
 
-    {% include "shop/_tables.html" %}
+    {% include "market/_tables.html" %}
     <!-- KEYS -->
     <q-card v-if="keys">
       <q-card-section>
@@ -149,16 +149,16 @@
     <q-card>
       <q-card-section>
         <h6 class="text-subtitle1 q-my-none">
-          LNbits Shop Extension, powered by Nostr
+          LNbits Market Extension (Nostr support coming soon)
         </h6>
       </q-card-section>
       <q-card-section class="q-pa-none">
         <q-separator></q-separator>
-        <q-list> {% include "shop/_api_docs.html" %} </q-list>
+        <q-list> {% include "market/_api_docs.html" %} </q-list>
       </q-card-section>
     </q-card>
     <!-- CHAT BOX -->
-    {% include "shop/_chat_box.html" %}
+    {% include "market/_chat_box.html" %}
   </div>
 </div>
 
@@ -215,7 +215,7 @@
     obj._data = _.clone(obj)
     obj.stalls = []
     LNbits.api
-      .request('GET', `/shop/api/v1/markets/${obj.id}/stalls`, null)
+      .request('GET', `/market/api/v1/markets/${obj.id}/stalls`, null)
       .then(response => {
         if (response.data) {
           obj.stalls = response.data.map(s => s.id) //.toString()
@@ -548,7 +548,7 @@
         LNbits.api
           .request(
             'PUT',
-            '/shop/api/v1/settings/' + this.g.user.id,
+            '/market/api/v1/settings/' + this.g.user.id,
             this.g.user.wallets[0].adminkey,
             data
           )
@@ -563,7 +563,7 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      shopDataDownload() {
+      marketDataDownload() {
         const removeClone = obj => {
           delete obj._data
           return obj
@@ -593,10 +593,10 @@
         this.keys = {privkey, pubkey}
         this.stallDialog.data.publickey = this.keys.pubkey
         this.stallDialog.data.privatekey = this.keys.privkey
-        this.$q.localStorage.set(`lnbits.shop.${this.g.user.id}`, this.keys)
+        this.$q.localStorage.set(`lnbits.market.${this.g.user.id}`, this.keys)
       },
       restoreKeys() {
-        let keys = this.$q.localStorage.getItem(`lnbits.shop.${this.g.user.id}`)
+        let keys = this.$q.localStorage.getItem(`lnbits.market.${this.g.user.id}`)
         if (keys) {
           this.keys = keys
           this.stallDialog.data.publickey = this.keys.pubkey
@@ -645,7 +645,7 @@
         LNbits.api
           .request(
             'GET',
-            '/shop/api/v1/stalls?all_wallets=true',
+            '/market/api/v1/stalls?all_wallets=true',
             self.g.user.wallets[0].adminkey
           )
           .then(function (response) {
@@ -704,7 +704,7 @@
         LNbits.api
           .request(
             'PUT',
-            '/shop/api/v1/stalls/' + data.id,
+            '/market/api/v1/stalls/' + data.id,
             _.findWhere(self.g.user.wallets, {
               id: self.stallDialog.data.wallet
             }).inkey,
@@ -726,7 +726,7 @@
         LNbits.api
           .request(
             'POST',
-            '/shop/api/v1/stalls',
+            '/market/api/v1/stalls',
             _.findWhere(self.g.user.wallets, {
               id: self.stallDialog.data.wallet
             }).inkey,
@@ -753,7 +753,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/shop/api/v1/stalls/' + stallId,
+                '/market/api/v1/stalls/' + stallId,
                 _.findWhere(self.g.user.wallets, {id: stall.wallet}).adminkey
               )
               .then(function (response) {
@@ -778,7 +778,7 @@
         LNbits.api
           .request(
             'GET',
-            '/shop/api/v1/products?all_stalls=true',
+            '/market/api/v1/products?all_stalls=true',
             self.g.user.wallets[0].inkey
           )
           .then(function (response) {
@@ -851,7 +851,7 @@
         LNbits.api
           .request(
             'PUT',
-            '/shop/api/v1/products/' + data.id,
+            '/market/api/v1/products/' + data.id,
             _.findWhere(self.g.user.wallets, {
               id: wallet
             }).inkey,
@@ -877,7 +877,7 @@
         LNbits.api
           .request(
             'POST',
-            '/shop/api/v1/products',
+            '/market/api/v1/products',
             _.findWhere(self.g.user.wallets, {id: walletId}).inkey,
             data
           )
@@ -899,7 +899,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/shop/api/v1/products/' + productId,
+                '/market/api/v1/products/' + productId,
                 _.findWhere(this.g.user.wallets, {id: walletId}).adminkey
               )
               .then(() => {
@@ -922,7 +922,7 @@
         var self = this
 
         LNbits.api
-          .request('GET', '/shop/api/v1/zones', this.g.user.wallets[0].inkey)
+          .request('GET', '/market/api/v1/zones', this.g.user.wallets[0].inkey)
           .then(function (response) {
             if (response.data) {
               self.zones = response.data.map(mapZone)
@@ -960,7 +960,7 @@
         LNbits.api
           .request(
             'POST',
-            '/shop/api/v1/zones/' + data.id,
+            '/market/api/v1/zones/' + data.id,
             self.g.user.wallets[0].adminkey,
             data
           )
@@ -982,7 +982,7 @@
         LNbits.api
           .request(
             'POST',
-            '/shop/api/v1/zones',
+            '/market/api/v1/zones',
             self.g.user.wallets[0].inkey,
             data
           )
@@ -1006,7 +1006,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/shop/api/v1/zones/' + zoneId,
+                '/market/api/v1/zones/' + zoneId,
                 self.g.user.wallets[0].adminkey
               )
               .then(function (response) {
@@ -1027,7 +1027,7 @@
       ////////////////////////////////////////
       getMarkets() {
         LNbits.api
-          .request('GET', '/shop/api/v1/markets', this.g.user.wallets[0].inkey)
+          .request('GET', '/market/api/v1/markets', this.g.user.wallets[0].inkey)
           .then(response => {
             if (response.data) {
               this.markets = response.data.map(mapMarkets)
@@ -1059,7 +1059,7 @@
         LNbits.api
           .request(
             'PUT',
-            '/shop/api/v1/markets/' + data.id,
+            '/market/api/v1/markets/' + data.id,
             this.g.user.wallets[0].inkey,
             data
           )
@@ -1080,7 +1080,7 @@
         LNbits.api
           .request(
             'POST',
-            '/shop/api/v1/markets',
+            '/market/api/v1/markets',
             this.g.user.wallets[0].inkey,
             data
           )
@@ -1094,8 +1094,8 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      deleteMarket(shopId) {
-        let market = _.findWhere(this.markets, {id: shopId})
+      deleteMarket(marketId) {
+        let market = _.findWhere(this.markets, {id: marketId})
 
         LNbits.utils
           .confirmDialog('Are you sure you want to delete this Marketplace?')
@@ -1103,12 +1103,12 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/shop/api/v1/markets/' + shopId,
+                '/market/api/v1/markets/' + marketId,
                 this.g.user.wallets[0].inkey
               )
               .then(response => {
                 this.markets = _.reject(this.markets, obj => {
-                  return obj.id == shopId
+                  return obj.id == marketId
                 })
               })
               .catch(function (error) {
@@ -1116,8 +1116,8 @@
               })
           })
       },
-      exportShopsCSV: function () {
-        LNbits.utils.exportCSV(this.shopsTable.columns, this.markets)
+      exportMarketsCSV: function () {
+        LNbits.utils.exportCSV(this.marketsTable.columns, this.markets)
       },
       ////////////////////////////////////////
       ////////////////ORDERS//////////////////
@@ -1128,7 +1128,7 @@
         await LNbits.api
           .request(
             'GET',
-            '/shop/api/v1/orders?all_wallets=true',
+            '/market/api/v1/orders?all_wallets=true',
             this.g.user.wallets[0].inkey
           )
           .then(response => {
@@ -1150,7 +1150,7 @@
             LNbits.api
               .request(
                 'DELETE',
-                '/shop/api/v1/orders/' + orderId,
+                '/market/api/v1/orders/' + orderId,
                 _.findWhere(self.g.user.wallets, {id: order.wallet}).adminkey
               )
               .then(function (response) {
@@ -1168,7 +1168,7 @@
         LNbits.api
           .request(
             'GET',
-            `/shop/api/v1/orders/shipped/${order_id}?shipped=${!shipped}`,
+            `/market/api/v1/orders/shipped/${order_id}?shipped=${!shipped}`,
             this.g.user.wallets[0].inkey
           )
           .then(response => {
@@ -1189,7 +1189,7 @@
         await LNbits.api
           .request(
             'GET',
-            `/shop/api/v1/chat/messages/merchant?orders=${this.orders
+            `/market/api/v1/chat/messages/merchant?orders=${this.orders
               .map(o => o.invoiceid)
               .toString()}`,
             this.g.user.wallets[0].adminkey
@@ -1205,7 +1205,7 @@
           })
       },
       updateLastSeenMsg(id) {
-        let data = this.$q.localStorage.getItem(`lnbits.shop.chat`)
+        let data = this.$q.localStorage.getItem(`lnbits.market.chat`)
         let chat = {
           ...data,
           [`${id}`]: {
@@ -1214,11 +1214,11 @@
             ]
           }
         }
-        this.$q.localStorage.set(`lnbits.shop.chat`, chat)
+        this.$q.localStorage.set(`lnbits.market.chat`, chat)
         this.checkUnreadMessages()
       },
       checkUnreadMessages() {
-        let lastMsgs = this.$q.localStorage.getItem(`lnbits.shop.chat`) || {}
+        let lastMsgs = this.$q.localStorage.getItem(`lnbits.market.chat`) || {}
 
         for (let key in this.messages) {
           let idx = this.orders.findIndex(f => f.invoiceid == key)
@@ -1287,7 +1287,7 @@
         if (this.ws.readyState === WebSocket.CLOSED) {
           console.log('WebSocket CLOSED: Reopening')
           this.ws = new WebSocket(
-            ws_scheme + location.host + '/shop/ws/' + this.customerKey
+            ws_scheme + location.host + '/market/ws/' + this.customerKey
           )
         }
       },
@@ -1318,7 +1318,7 @@
         } else {
           ws_scheme = 'ws://'
         }
-        ws = new WebSocket(ws_scheme + location.host + '/shop/ws/' + room_name)
+        ws = new WebSocket(ws_scheme + location.host + '/market/ws/' + room_name)
 
         ws.onmessage = async event => {
           let event_data = JSON.parse(event.data)
@@ -1335,7 +1335,7 @@
       },
       async getCurrencies() {
         await LNbits.api
-          .request('GET', '/shop/api/v1/currencies')
+          .request('GET', '/market/api/v1/currencies')
           .then(response => {
             this.currencies.units = ['sat', ...response.data]
           })
@@ -1359,7 +1359,7 @@
         await this.getOrders()
         this.getMarkets()
         await this.getAllMessages()
-        let keys = this.$q.localStorage.getItem(`lnbits.shop.${this.g.user.id}`)
+        let keys = this.$q.localStorage.getItem(`lnbits.market.${this.g.user.id}`)
         if (keys) {
           this.keys = keys
         }
diff --git a/lnbits/extensions/shop/templates/shop/market.html b/lnbits/extensions/market/templates/market/market.html
similarity index 97%
rename from lnbits/extensions/shop/templates/shop/market.html
rename to lnbits/extensions/market/templates/market/market.html
index 6763ef3b..e59bb245 100644
--- a/lnbits/extensions/shop/templates/shop/market.html
+++ b/lnbits/extensions/market/templates/market/market.html
@@ -33,7 +33,7 @@
     <q-card class="card--product">
       {% raw %}
       <q-img
-        :src="item.image ? item.image : '/shop/static/images/placeholder.png'"
+        :src="item.image ? item.image : '/market/static/images/placeholder.png'"
         alt="Product Image"
         loading="lazy"
         spinner-color="white"
@@ -98,7 +98,7 @@
           dense
           color="primary"
           type="a"
-          :href="'/shop/stalls/' + item.stall"
+          :href="'/market/stalls/' + item.stall"
           target="_blank"
         >
           Visit Stall
diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/market/templates/market/order.html
similarity index 95%
rename from lnbits/extensions/shop/templates/shop/order.html
rename to lnbits/extensions/market/templates/market/order.html
index 14d14f34..ebabe882 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/market/templates/market/order.html
@@ -292,7 +292,7 @@
         lnbitsBookmark: {
           show: true,
           finish: () => {
-            this.$q.localStorage.set('lnbits.shopbookmark', false)
+            this.$q.localStorage.set('lnbits.marketbookmark', false)
             this.lnbitsBookmark.show = false
           }
         },
@@ -368,8 +368,8 @@
       },
       restoreKeys() {
         this.user.keys = this.keysDialog.data
-        let data = this.$q.localStorage.getItem(`lnbits.shop.data`)
-        this.$q.localStorage.set(`lnbits.shop.data`, {
+        let data = this.$q.localStorage.getItem(`lnbits.market.data`)
+        this.$q.localStorage.set(`lnbits.market.data`, {
           ...data,
           keys: this.user.keys
         })
@@ -380,7 +380,7 @@
         LNbits.utils
           .confirmDialog('Are you sure you want to delete your stored data?')
           .onOk(() => {
-            this.$q.localStorage.remove('lnbits.shop.data')
+            this.$q.localStorage.remove('lnbits.market.data')
             this.user = null
           })
       },
@@ -401,7 +401,7 @@
         await LNbits.api
           .request(
             'GET',
-            `/shop/api/v1/chat/messages/${room_name}${
+            `/market/api/v1/chat/messages/${room_name}${
               all ? '?all_messages=true' : ''
             }`
           )
@@ -430,7 +430,7 @@
         if (this.ws.readyState === WebSocket.CLOSED) {
           console.log('WebSocket CLOSED: Reopening')
           this.ws = new WebSocket(
-            ws_scheme + location.host + '/shop/ws/' + this.selectedOrder
+            ws_scheme + location.host + '/market/ws/' + this.selectedOrder
           )
         }
       },
@@ -443,7 +443,7 @@
         } else {
           ws_scheme = 'ws://'
         }
-        ws = new WebSocket(ws_scheme + location.host + '/shop/ws/' + room_name)
+        ws = new WebSocket(ws_scheme + location.host + '/market/ws/' + room_name)
 
         ws.onmessage = event => {
           let event_data = JSON.parse(event.data)
@@ -455,7 +455,7 @@
       }
     },
     async created() {
-      let showBookmark = this.$q.localStorage.getItem('lnbits.shopbookmark')
+      let showBookmark = this.$q.localStorage.getItem('lnbits.marketbookmark')
       this.lnbitsBookmark.show = showBookmark === true || showBookmark == null
 
       let order_details = JSON.parse('{{ order | tojson }}')
@@ -488,7 +488,7 @@
         this.products = this.products.map(mapProductsItems)
       }
 
-      let data = this.$q.localStorage.getItem(`lnbits.shop.data`) || false
+      let data = this.$q.localStorage.getItem(`lnbits.market.data`) || false
 
       if (data) {
         this.user = data
@@ -501,7 +501,7 @@
         try {
           await LNbits.api.request(
             'GET',
-            `/shop/api/v1/order/pubkey/${order_id}/${this.user.keys.publickey}`
+            `/market/api/v1/order/pubkey/${order_id}/${this.user.keys.publickey}`
           )
         } catch (error) {
           LNbits.utils.notifyApiError(error)
@@ -516,7 +516,7 @@
 
       await this.getMessages(order_id)
 
-      this.$q.localStorage.set(`lnbits.shop.data`, this.user)
+      this.$q.localStorage.set(`lnbits.market.data`, this.user)
       this.startChat(order_id)
     }
   })
diff --git a/lnbits/extensions/shop/templates/shop/product.html b/lnbits/extensions/market/templates/market/product.html
similarity index 100%
rename from lnbits/extensions/shop/templates/shop/product.html
rename to lnbits/extensions/market/templates/market/product.html
diff --git a/lnbits/extensions/shop/templates/shop/stall.html b/lnbits/extensions/market/templates/market/stall.html
similarity index 96%
rename from lnbits/extensions/shop/templates/shop/stall.html
rename to lnbits/extensions/market/templates/market/stall.html
index f715cf37..f9189b30 100644
--- a/lnbits/extensions/shop/templates/shop/stall.html
+++ b/lnbits/extensions/market/templates/market/stall.html
@@ -94,7 +94,7 @@
     <q-card class="card--product">
       {% raw %}
       <q-img
-        :src="item.image ? item.image : '/shop/static/images/placeholder.png'"
+        :src="item.image ? item.image : '/market/static/images/placeholder.png'"
         alt="Product Image"
         loading="lazy"
         spinner-color="white"
@@ -431,7 +431,7 @@
         console.log(this.cart, this.cartMenu)
       },
       getPubkey() {
-        let data = this.$q.localStorage.getItem(`lnbits.shop.data`)
+        let data = this.$q.localStorage.getItem(`lnbits.market.data`)
         if (data && data.keys.publickey) {
           this.checkoutDialog.data.pubkey = data.keys.publickey
         } else {
@@ -456,7 +456,7 @@
           })
         }
         LNbits.api
-          .request('POST', '/shop/api/v1/orders', null, data)
+          .request('POST', '/market/api/v1/orders', null, data)
           .then(res => {
             this.checkoutDialog = {show: false, data: {}}
 
@@ -477,7 +477,7 @@
               LNbits.api
                 .request(
                   'GET',
-                  `/shop/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
+                  `/market/api/v1/orders/payments/${this.qrCodeDialog.data.payment_hash}`
                 )
                 .then(res => {
                   if (res.data.paid) {
@@ -491,7 +491,7 @@
                         {
                           label: 'See Order',
                           handler: () => {
-                            window.location.href = `/shop/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
+                            window.location.href = `/market/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
                           }
                         }
                       ]
@@ -500,7 +500,7 @@
                     this.resetCart()
                     this.closeQrCodeDialog()
                     setTimeout(() => {
-                      window.location.href = `/shop/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
+                      window.location.href = `/market/order/?merch=${this.stall.id}&invoice_id=${this.qrCodeDialog.data.payment_hash}`
                     }, 5000)
                   }
                 })
diff --git a/lnbits/extensions/shop/views.py b/lnbits/extensions/market/views.py
similarity index 67%
rename from lnbits/extensions/shop/views.py
rename to lnbits/extensions/market/views.py
index 309ed134..23bc5706 100644
--- a/lnbits/extensions/shop/views.py
+++ b/lnbits/extensions/market/views.py
@@ -17,48 +17,48 @@ from starlette.responses import HTMLResponse
 
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists  # type: ignore
-from lnbits.extensions.shop import shop_ext, shop_renderer
-from lnbits.extensions.shop.models import CreateChatMessage, SetSettings
-from lnbits.extensions.shop.notifier import Notifier
+from lnbits.extensions.market import market_ext, market_renderer
+from lnbits.extensions.market.models import CreateChatMessage, SetSettings
+from lnbits.extensions.market.notifier import Notifier
 
 from .crud import (
     create_chat_message,
-    create_shop_settings,
-    get_shop_market,
-    get_shop_market_stalls,
-    get_shop_order_details,
-    get_shop_order_invoiceid,
-    get_shop_products,
-    get_shop_settings,
-    get_shop_stall,
-    get_shop_zone,
-    get_shop_zones,
-    update_shop_product_stock,
+    create_market_settings,
+    get_market_market,
+    get_market_market_stalls,
+    get_market_order_details,
+    get_market_order_invoiceid,
+    get_market_products,
+    get_market_settings,
+    get_market_stall,
+    get_market_zone,
+    get_market_zones,
+    update_market_product_stock,
 )
 
 templates = Jinja2Templates(directory="templates")
 
 
-@shop_ext.get("/", response_class=HTMLResponse)
+@market_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
-    settings = await get_shop_settings(user=user.id)
+    settings = await get_market_settings(user=user.id)
 
     if not settings:
-        await create_shop_settings(
+        await create_market_settings(
             user=user.id, data=SetSettings(currency="sat", fiat_base_multiplier=1)
         )
-        settings = await get_shop_settings(user.id)
+        settings = await get_market_settings(user.id)
     assert settings
-    return shop_renderer().TemplateResponse(
-        "shop/index.html",
+    return market_renderer().TemplateResponse(
+        "market/index.html",
         {"request": request, "user": user.dict(), "currency": settings.currency},
     )
 
 
-@shop_ext.get("/stalls/{stall_id}", response_class=HTMLResponse)
+@market_ext.get("/stalls/{stall_id}", response_class=HTMLResponse)
 async def stall(request: Request, stall_id):
-    stall = await get_shop_stall(stall_id)
-    products = await get_shop_products(stall_id)
+    stall = await get_market_stall(stall_id)
+    products = await get_market_products(stall_id)
 
     if not stall:
         raise HTTPException(
@@ -67,7 +67,7 @@ async def stall(request: Request, stall_id):
 
     zones = []
     for id in stall.shippingzones.split(","):
-        zone = await get_shop_zone(id)
+        zone = await get_market_zone(id)
         assert zone
         z = zone.dict()
         zones.append({"label": z["countries"], "cost": z["cost"], "value": z["id"]})
@@ -76,8 +76,8 @@ async def stall(request: Request, stall_id):
 
     _stall["zones"] = zones
 
-    return shop_renderer().TemplateResponse(
-        "shop/stall.html",
+    return market_renderer().TemplateResponse(
+        "market/stall.html",
         {
             "request": request,
             "stall": _stall,
@@ -86,21 +86,21 @@ async def stall(request: Request, stall_id):
     )
 
 
-@shop_ext.get("/market/{market_id}", response_class=HTMLResponse)
+@market_ext.get("/market/{market_id}", response_class=HTMLResponse)
 async def market(request: Request, market_id):
-    market = await get_shop_market(market_id)
+    market = await get_market_market(market_id)
 
     if not market:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Marketplace doesn't exist."
         )
 
-    stalls = await get_shop_market_stalls(market_id)
+    stalls = await get_market_market_stalls(market_id)
     stalls_ids = [stall.id for stall in stalls]
-    products = [product.dict() for product in await get_shop_products(stalls_ids)]
+    products = [product.dict() for product in await get_market_products(stalls_ids)]
 
-    return shop_renderer().TemplateResponse(
-        "shop/market.html",
+    return market_renderer().TemplateResponse(
+        "market/market.html",
         {
             "request": request,
             "market": market,
@@ -110,23 +110,23 @@ async def market(request: Request, market_id):
     )
 
 
-@shop_ext.get("/order", response_class=HTMLResponse)
+@market_ext.get("/order", response_class=HTMLResponse)
 async def order_chat(
     request: Request,
     merch: str = Query(...),
     invoice_id: str = Query(...),
     keys: str = Query(None),
 ):
-    stall = await get_shop_stall(merch)
+    stall = await get_market_stall(merch)
     assert stall
-    order = await get_shop_order_invoiceid(invoice_id)
+    order = await get_market_order_invoiceid(invoice_id)
     assert order
-    _order = await get_shop_order_details(order.id)
-    products = await get_shop_products(stall.id)
+    _order = await get_market_order_details(order.id)
+    products = await get_market_products(stall.id)
     assert products
 
-    return shop_renderer().TemplateResponse(
-        "shop/order.html",
+    return market_renderer().TemplateResponse(
+        "market/order.html",
         {
             "request": request,
             "stall": {
@@ -151,7 +151,7 @@ async def order_chat(
 notifier = Notifier()
 
 
-@shop_ext.websocket("/ws/{room_name}")
+@market_ext.websocket("/ws/{room_name}")
 async def websocket_endpoint(
     websocket: WebSocket, room_name: str, background_tasks: BackgroundTasks
 ):
diff --git a/lnbits/extensions/shop/views_api.py b/lnbits/extensions/market/views_api.py
similarity index 51%
rename from lnbits/extensions/shop/views_api.py
rename to lnbits/extensions/market/views_api.py
index 87374b20..8d0202a3 100644
--- a/lnbits/extensions/shop/views_api.py
+++ b/lnbits/extensions/market/views_api.py
@@ -19,44 +19,44 @@ from lnbits.decorators import (
 from lnbits.helpers import urlsafe_short_hash
 from lnbits.utils.exchange_rates import currencies, get_fiat_rate_satoshis
 
-from . import db, shop_ext
+from . import db, market_ext
 from .crud import (
-    create_shop_market,
-    create_shop_market_stalls,
-    create_shop_order,
-    create_shop_order_details,
-    create_shop_product,
-    create_shop_settings,
-    create_shop_stall,
-    create_shop_zone,
-    delete_shop_order,
-    delete_shop_product,
-    delete_shop_stall,
-    delete_shop_zone,
-    get_shop_chat_by_merchant,
-    get_shop_chat_messages,
-    get_shop_latest_chat_messages,
-    get_shop_market,
-    get_shop_market_stalls,
-    get_shop_markets,
-    get_shop_order,
-    get_shop_order_details,
-    get_shop_order_invoiceid,
-    get_shop_orders,
-    get_shop_product,
-    get_shop_products,
-    get_shop_settings,
-    get_shop_stall,
-    get_shop_stalls,
-    get_shop_stalls_by_ids,
-    get_shop_zone,
-    get_shop_zones,
-    set_shop_order_pubkey,
-    set_shop_settings,
-    update_shop_market,
-    update_shop_product,
-    update_shop_stall,
-    update_shop_zone,
+    create_market_market,
+    create_market_market_stalls,
+    create_market_order,
+    create_market_order_details,
+    create_market_product,
+    create_market_settings,
+    create_market_stall,
+    create_market_zone,
+    delete_market_order,
+    delete_market_product,
+    delete_market_stall,
+    delete_market_zone,
+    get_market_chat_by_merchant,
+    get_market_chat_messages,
+    get_market_latest_chat_messages,
+    get_market_market,
+    get_market_market_stalls,
+    get_market_markets,
+    get_market_order,
+    get_market_order_details,
+    get_market_order_invoiceid,
+    get_market_orders,
+    get_market_product,
+    get_market_products,
+    get_market_settings,
+    get_market_stall,
+    get_market_stalls,
+    get_market_stalls_by_ids,
+    get_market_zone,
+    get_market_zones,
+    set_market_order_pubkey,
+    set_market_settings,
+    update_market_market,
+    update_market_product,
+    update_market_stall,
+    update_market_zone,
 )
 from .models import (
     CreateMarket,
@@ -76,8 +76,8 @@ from .models import (
 
 
 ### Products
-@shop_ext.get("/api/v1/products")
-async def api_shop_products(
+@market_ext.get("/api/v1/products")
+async def api_market_products(
     wallet: WalletTypeInfo = Depends(require_invoice_key),
     all_stalls: bool = Query(False),
 ):
@@ -87,104 +87,104 @@ async def api_shop_products(
         user = await get_user(wallet.wallet.user)
         wallet_ids = user.wallet_ids if user else []
 
-    stalls = [stall.id for stall in await get_shop_stalls(wallet_ids)]
+    stalls = [stall.id for stall in await get_market_stalls(wallet_ids)]
 
     if not stalls:
         return
 
-    return [product.dict() for product in await get_shop_products(stalls)]
+    return [product.dict() for product in await get_market_products(stalls)]
 
 
-@shop_ext.post("/api/v1/products")
-@shop_ext.put("/api/v1/products/{product_id}")
-async def api_shop_product_create(
+@market_ext.post("/api/v1/products")
+@market_ext.put("/api/v1/products/{product_id}")
+async def api_market_product_create(
     data: createProduct,
     product_id=None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
     # For fiat currencies,
     # we multiply by data.fiat_base_multiplier (usually 100) to save the value in cents.
-    settings = await get_shop_settings(user=wallet.wallet.user)
+    settings = await get_market_settings(user=wallet.wallet.user)
     assert settings
 
-    stall = await get_shop_stall(stall_id=data.stall)
+    stall = await get_market_stall(stall_id=data.stall)
     assert stall
 
     if stall.currency != "sat":
         data.price *= settings.fiat_base_multiplier
 
     if product_id:
-        product = await get_shop_product(product_id)
+        product = await get_market_product(product_id)
         if not product:
             return {"message": "Product does not exist."}
 
-        # stall = await get_shop_stall(stall_id=product.stall)
+        # stall = await get_market_stall(stall_id=product.stall)
         if stall.wallet != wallet.wallet.id:
             return {"message": "Not your product."}
 
-        product = await update_shop_product(product_id, **data.dict())
+        product = await update_market_product(product_id, **data.dict())
     else:
-        product = await create_shop_product(data=data)
+        product = await create_market_product(data=data)
     assert product
     return product.dict()
 
 
-@shop_ext.delete("/api/v1/products/{product_id}")
-async def api_shop_products_delete(
+@market_ext.delete("/api/v1/products/{product_id}")
+async def api_market_products_delete(
     product_id, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    product = await get_shop_product(product_id)
+    product = await get_market_product(product_id)
 
     if not product:
         return {"message": "Product does not exist."}
 
-    stall = await get_shop_stall(product.stall)
+    stall = await get_market_stall(product.stall)
     assert stall
 
     if stall.wallet != wallet.wallet.id:
-        return {"message": "Not your Shop."}
+        return {"message": "Not your Market."}
 
-    await delete_shop_product(product_id)
+    await delete_market_product(product_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 # # # Shippingzones
 
 
-@shop_ext.get("/api/v1/zones")
-async def api_shop_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
+@market_ext.get("/api/v1/zones")
+async def api_market_zones(wallet: WalletTypeInfo = Depends(get_key_type)):
 
-    return await get_shop_zones(wallet.wallet.user)
+    return await get_market_zones(wallet.wallet.user)
 
 
-@shop_ext.post("/api/v1/zones")
-async def api_shop_zone_create(
+@market_ext.post("/api/v1/zones")
+async def api_market_zone_create(
     data: createZones, wallet: WalletTypeInfo = Depends(get_key_type)
 ):
-    zone = await create_shop_zone(user=wallet.wallet.user, data=data)
+    zone = await create_market_zone(user=wallet.wallet.user, data=data)
     return zone.dict()
 
 
-@shop_ext.post("/api/v1/zones/{zone_id}")
-async def api_shop_zone_update(
+@market_ext.post("/api/v1/zones/{zone_id}")
+async def api_market_zone_update(
     data: createZones,
     zone_id: str,
     wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
-    zone = await get_shop_zone(zone_id)
+    zone = await get_market_zone(zone_id)
     if not zone:
         return {"message": "Zone does not exist."}
     if zone.user != wallet.wallet.user:
         return {"message": "Not your record."}
-    zone = await update_shop_zone(zone_id, **data.dict())
+    zone = await update_market_zone(zone_id, **data.dict())
     return zone
 
 
-@shop_ext.delete("/api/v1/zones/{zone_id}")
-async def api_shop_zone_delete(
+@market_ext.delete("/api/v1/zones/{zone_id}")
+async def api_market_zone_delete(
     zone_id, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    zone = await get_shop_zone(zone_id)
+    zone = await get_market_zone(zone_id)
 
     if not zone:
         return {"message": "zone does not exist."}
@@ -192,15 +192,15 @@ async def api_shop_zone_delete(
     if zone.user != wallet.wallet.user:
         return {"message": "Not your zone."}
 
-    await delete_shop_zone(zone_id)
+    await delete_market_zone(zone_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 # # # Stalls
 
 
-@shop_ext.get("/api/v1/stalls")
-async def api_shop_stalls(
+@market_ext.get("/api/v1/stalls")
+async def api_market_stalls(
     wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
 ):
     wallet_ids = [wallet.wallet.id]
@@ -209,37 +209,37 @@ async def api_shop_stalls(
         user = await get_user(wallet.wallet.user)
         wallet_ids = user.wallet_ids if user else []
 
-    return [stall.dict() for stall in await get_shop_stalls(wallet_ids)]
+    return [stall.dict() for stall in await get_market_stalls(wallet_ids)]
 
 
-@shop_ext.post("/api/v1/stalls")
-@shop_ext.put("/api/v1/stalls/{stall_id}")
-async def api_shop_stall_create(
+@market_ext.post("/api/v1/stalls")
+@market_ext.put("/api/v1/stalls/{stall_id}")
+async def api_market_stall_create(
     data: createStalls,
     stall_id: str = None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
 
     if stall_id:
-        stall = await get_shop_stall(stall_id)
+        stall = await get_market_stall(stall_id)
         if not stall:
             return {"message": "Withdraw stall does not exist."}
 
         if stall.wallet != wallet.wallet.id:
             return {"message": "Not your withdraw stall."}
 
-        stall = await update_shop_stall(stall_id, **data.dict())
+        stall = await update_market_stall(stall_id, **data.dict())
     else:
-        stall = await create_shop_stall(data=data)
+        stall = await create_market_stall(data=data)
     assert stall
     return stall.dict()
 
 
-@shop_ext.delete("/api/v1/stalls/{stall_id}")
-async def api_shop_stall_delete(
+@market_ext.delete("/api/v1/stalls/{stall_id}")
+async def api_market_stall_delete(
     stall_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    stall = await get_shop_stall(stall_id)
+    stall = await get_market_stall(stall_id)
 
     if not stall:
         return {"message": "Stall does not exist."}
@@ -247,15 +247,15 @@ async def api_shop_stall_delete(
     if stall.wallet != wallet.wallet.id:
         return {"message": "Not your Stall."}
 
-    await delete_shop_stall(stall_id)
+    await delete_market_stall(stall_id)
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 ###Orders
 
 
-@shop_ext.get("/api/v1/orders")
-async def api_shop_orders(
+@market_ext.get("/api/v1/orders")
+async def api_market_orders(
     wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)
 ):
     wallet_ids = [wallet.wallet.id]
@@ -263,48 +263,48 @@ async def api_shop_orders(
         user = await get_user(wallet.wallet.user)
         wallet_ids = user.wallet_ids if user else []
 
-    orders = await get_shop_orders(wallet_ids)
+    orders = await get_market_orders(wallet_ids)
     if not orders:
         return
     orders_with_details = []
     for order in orders:
         _order = order.dict()
-        _order["details"] = await get_shop_order_details(_order["id"])
+        _order["details"] = await get_market_order_details(_order["id"])
         orders_with_details.append(_order)
     try:
         return orders_with_details  # [order for order in orders]
-        # return [order.dict() for order in await get_shop_orders(wallet_ids)]
+        # return [order.dict() for order in await get_market_orders(wallet_ids)]
     except:
         return {"message": "We could not retrieve the orders."}
 
 
-@shop_ext.get("/api/v1/orders/{order_id}")
-async def api_shop_order_by_id(order_id: str):
-    order = await get_shop_order(order_id)
+@market_ext.get("/api/v1/orders/{order_id}")
+async def api_market_order_by_id(order_id: str):
+    order = await get_market_order(order_id)
     assert order
     _order = order.dict()
-    _order["details"] = await get_shop_order_details(order_id)
+    _order["details"] = await get_market_order_details(order_id)
 
     return _order
 
 
-@shop_ext.post("/api/v1/orders")
-async def api_shop_order_create(data: createOrder):
+@market_ext.post("/api/v1/orders")
+async def api_market_order_create(data: createOrder):
     ref = urlsafe_short_hash()
 
     payment_hash, payment_request = await create_invoice(
         wallet_id=data.wallet,
         amount=data.total,
-        memo=f"New order on Diagon alley",
+        memo=f"New order on Market",
         extra={
-            "tag": "shop",
+            "tag": "market",
             "reference": ref,
         },
     )
-    order_id = await create_shop_order(invoiceid=payment_hash, data=data)
+    order_id = await create_market_order(invoiceid=payment_hash, data=data)
     logger.debug(f"ORDER ID {order_id}")
     logger.debug(f"PRODUCTS {data.products}")
-    await create_shop_order_details(order_id=order_id, data=data.products)
+    await create_market_order_details(order_id=order_id, data=data.products)
     return {
         "payment_hash": payment_hash,
         "payment_request": payment_request,
@@ -312,9 +312,9 @@ async def api_shop_order_create(data: createOrder):
     }
 
 
-@shop_ext.get("/api/v1/orders/payments/{payment_hash}")
-async def api_shop_check_payment(payment_hash: str):
-    order = await get_shop_order_invoiceid(payment_hash)
+@market_ext.get("/api/v1/orders/payments/{payment_hash}")
+async def api_market_check_payment(payment_hash: str):
+    order = await get_market_order_invoiceid(payment_hash)
     if not order:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Order does not exist."
@@ -328,11 +328,11 @@ async def api_shop_check_payment(payment_hash: str):
     return status
 
 
-@shop_ext.delete("/api/v1/orders/{order_id}")
-async def api_shop_order_delete(
+@market_ext.delete("/api/v1/orders/{order_id}")
+async def api_market_order_delete(
     order_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    order = await get_shop_order(order_id)
+    order = await get_market_order(order_id)
 
     if not order:
         return {"message": "Order does not exist."}
@@ -340,17 +340,17 @@ async def api_shop_order_delete(
     if order.wallet != wallet.wallet.id:
         return {"message": "Not your Order."}
 
-    await delete_shop_order(order_id)
+    await delete_market_order(order_id)
 
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
-# @shop_ext.get("/api/v1/orders/paid/{order_id}")
-# async def api_shop_order_paid(
+# @market_ext.get("/api/v1/orders/paid/{order_id}")
+# async def api_market_order_paid(
 #     order_id, wallet: WalletTypeInfo = Depends(require_admin_key)
 # ):
 #     await db.execute(
-#         "UPDATE shop.orders SET paid = ? WHERE id = ?",
+#         "UPDATE market.orders SET paid = ? WHERE id = ?",
 #         (
 #             True,
 #             order_id,
@@ -359,24 +359,24 @@ async def api_shop_order_delete(
 #     return "", HTTPStatus.OK
 
 
-@shop_ext.get("/api/v1/order/pubkey/{payment_hash}/{pubkey}")
-async def api_shop_order_pubkey(payment_hash: str, pubkey: str):
-    await set_shop_order_pubkey(payment_hash, pubkey)
+@market_ext.get("/api/v1/order/pubkey/{payment_hash}/{pubkey}")
+async def api_market_order_pubkey(payment_hash: str, pubkey: str):
+    await set_market_order_pubkey(payment_hash, pubkey)
     return "", HTTPStatus.OK
 
 
-@shop_ext.get("/api/v1/orders/shipped/{order_id}")
-async def api_shop_order_shipped(
+@market_ext.get("/api/v1/orders/shipped/{order_id}")
+async def api_market_order_shipped(
     order_id, shipped: bool = Query(...), wallet: WalletTypeInfo = Depends(get_key_type)
 ):
     await db.execute(
-        "UPDATE shop.orders SET shipped = ? WHERE id = ?",
+        "UPDATE market.orders SET shipped = ? WHERE id = ?",
         (
             shipped,
             order_id,
         ),
     )
-    order = await db.fetchone("SELECT * FROM shop.orders WHERE id = ?", (order_id,))
+    order = await db.fetchone("SELECT * FROM market.orders WHERE id = ?", (order_id,))
 
     return order
 
@@ -384,31 +384,31 @@ async def api_shop_order_shipped(
 ###List products based on stall id
 
 
-# @shop_ext.get("/api/v1/stall/products/{stall_id}")
-# async def api_shop_stall_products(
+# @market_ext.get("/api/v1/stall/products/{stall_id}")
+# async def api_market_stall_products(
 #     stall_id, wallet: WalletTypeInfo = Depends(get_key_type)
 # ):
 
-#     rows = await db.fetchone("SELECT * FROM shop.stalls WHERE id = ?", (stall_id,))
+#     rows = await db.fetchone("SELECT * FROM market.stalls WHERE id = ?", (stall_id,))
 #     if not rows:
 #         return {"message": "Stall does not exist."}
 
-#     products = db.fetchone("SELECT * FROM shop.products WHERE wallet = ?", (rows[1],))
+#     products = db.fetchone("SELECT * FROM market.products WHERE wallet = ?", (rows[1],))
 #     if not products:
 #         return {"message": "No products"}
 
-#     return [products.dict() for products in await get_shop_products(rows[1])]
+#     return [products.dict() for products in await get_market_products(rows[1])]
 
 
 ###Check a product has been shipped
 
 
-# @shop_ext.get("/api/v1/stall/checkshipped/{checking_id}")
-# async def api_shop_stall_checkshipped(
+# @market_ext.get("/api/v1/stall/checkshipped/{checking_id}")
+# async def api_market_stall_checkshipped(
 #     checking_id, wallet: WalletTypeInfo = Depends(get_key_type)
 # ):
 #     rows = await db.fetchone(
-#         "SELECT * FROM shop.orders WHERE invoiceid = ?", (checking_id,)
+#         "SELECT * FROM market.orders WHERE invoiceid = ?", (checking_id,)
 #     )
 #     return {"shipped": rows["shipped"]}
 
@@ -418,42 +418,42 @@ async def api_shop_order_shipped(
 ##
 
 
-@shop_ext.get("/api/v1/markets")
-async def api_shop_markets(wallet: WalletTypeInfo = Depends(get_key_type)):
-    # await get_shop_market_stalls(market_id="FzpWnMyHQMcRppiGVua4eY")
+@market_ext.get("/api/v1/markets")
+async def api_market_markets(wallet: WalletTypeInfo = Depends(get_key_type)):
+    # await get_market_market_stalls(market_id="FzpWnMyHQMcRppiGVua4eY")
     try:
-        return [market.dict() for market in await get_shop_markets(wallet.wallet.user)]
+        return [market.dict() for market in await get_market_markets(wallet.wallet.user)]
     except:
         return {"message": "We could not retrieve the markets."}
 
 
-@shop_ext.get("/api/v1/markets/{market_id}/stalls")
-async def api_shop_market_stalls(market_id: str):
-    stall_ids = await get_shop_market_stalls(market_id)
+@market_ext.get("/api/v1/markets/{market_id}/stalls")
+async def api_market_market_stalls(market_id: str):
+    stall_ids = await get_market_market_stalls(market_id)
     return stall_ids
 
 
-@shop_ext.post("/api/v1/markets")
-@shop_ext.put("/api/v1/markets/{market_id}")
-async def api_shop_market_create(
+@market_ext.post("/api/v1/markets")
+@market_ext.put("/api/v1/markets/{market_id}")
+async def api_market_market_create(
     data: CreateMarket,
     market_id: str = None,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
     if market_id:
-        market = await get_shop_market(market_id)
+        market = await get_market_market(market_id)
         if not market:
             return {"message": "Market does not exist."}
 
         if market.usr != wallet.wallet.user:
             return {"message": "Not your market."}
 
-        market = await update_shop_market(market_id, data.name)
+        market = await update_market_market(market_id, data.name)
     else:
-        market = await create_shop_market(data=data)
+        market = await create_market_market(data=data)
 
     assert market
-    await create_shop_market_stalls(market_id=market.id, data=data.stalls)
+    await create_market_market_stalls(market_id=market.id, data=data.stalls)
 
     return market.dict()
 
@@ -461,39 +461,39 @@ async def api_shop_market_create(
 ## MESSAGES/CHAT
 
 
-@shop_ext.get("/api/v1/chat/messages/merchant")
+@market_ext.get("/api/v1/chat/messages/merchant")
 async def api_get_merchant_messages(
     orders: str = Query(...), wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
-    return [msg.dict() for msg in await get_shop_chat_by_merchant(orders.split(","))]
+    return [msg.dict() for msg in await get_market_chat_by_merchant(orders.split(","))]
 
 
-@shop_ext.get("/api/v1/chat/messages/{room_name}")
+@market_ext.get("/api/v1/chat/messages/{room_name}")
 async def api_get_latest_chat_msg(room_name: str, all_messages: bool = Query(False)):
     if all_messages:
-        messages = await get_shop_chat_messages(room_name)
+        messages = await get_market_chat_messages(room_name)
     else:
-        messages = await get_shop_latest_chat_messages(room_name)
+        messages = await get_market_latest_chat_messages(room_name)
 
     return messages
 
 
-@shop_ext.get("/api/v1/currencies")
+@market_ext.get("/api/v1/currencies")
 async def api_list_currencies_available():
     return list(currencies.keys())
 
 
-@shop_ext.get("/api/v1/settings")
+@market_ext.get("/api/v1/settings")
 async def api_get_settings(wallet: WalletTypeInfo = Depends(require_admin_key)):
     user = wallet.wallet.user
 
-    settings = await get_shop_settings(user)
+    settings = await get_market_settings(user)
 
     return settings
 
 
-@shop_ext.post("/api/v1/settings")
-@shop_ext.put("/api/v1/settings/{usr}")
+@market_ext.post("/api/v1/settings")
+@market_ext.put("/api/v1/settings/{usr}")
 async def api_set_settings(
     data: SetSettings,
     usr: str = None,
@@ -501,16 +501,16 @@ async def api_set_settings(
 ):
     if usr:
         if usr != wallet.wallet.user:
-            return {"message": "Not your Shop."}
+            return {"message": "Not your Market."}
 
-        settings = await get_shop_settings(user=usr)
+        settings = await get_market_settings(user=usr)
         assert settings
 
         if settings.user != wallet.wallet.user:
-            return {"message": "Not your Shop."}
+            return {"message": "Not your Market."}
 
-        return await set_shop_settings(usr, data)
+        return await set_market_settings(usr, data)
 
     user = wallet.wallet.user
 
-    return await create_shop_settings(user, data)
+    return await create_market_settings(user, data)
diff --git a/lnbits/extensions/shop/config.json b/lnbits/extensions/shop/config.json
deleted file mode 100644
index eba0def9..00000000
--- a/lnbits/extensions/shop/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "Shop",
-  "short_description": "Make a webshop on LNbits",
-	"tile": "/shop/static/images/bitcoin-shop.png",
-  "contributors": ["benarc", "talvasconcelos"]
-}

From a035612da3460eb6178cc9a03be5c14c130402ca Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Wed, 4 Jan 2023 21:11:06 +0000
Subject: [PATCH 173/174] format

---
 lnbits/extensions/market/crud.py              |  6 ++++--
 .../market/templates/market/index.html        | 21 ++++++++++++++-----
 .../market/templates/market/order.html        |  4 +++-
 lnbits/extensions/market/views_api.py         |  4 +++-
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/lnbits/extensions/market/crud.py b/lnbits/extensions/market/crud.py
index 6d82b354..1d9c28be 100644
--- a/lnbits/extensions/market/crud.py
+++ b/lnbits/extensions/market/crud.py
@@ -14,10 +14,10 @@ from .models import (
     CreateMarket,
     CreateMarketStalls,
     Market,
+    MarketSettings,
     OrderDetail,
     Orders,
     Products,
-    MarketSettings,
     Stalls,
     Zones,
     createOrder,
@@ -456,7 +456,9 @@ async def get_market_chat_by_merchant(ids: List[str]) -> List[ChatMessage]:
 
 
 async def get_market_settings(user) -> Optional[MarketSettings]:
-    row = await db.fetchone("""SELECT * FROM market.settings WHERE "user" = ?""", (user,))
+    row = await db.fetchone(
+        """SELECT * FROM market.settings WHERE "user" = ?""", (user,)
+    )
 
     return MarketSettings(**row) if row else None
 
diff --git a/lnbits/extensions/market/templates/market/index.html b/lnbits/extensions/market/templates/market/index.html
index e16e5d48..ffcb612b 100644
--- a/lnbits/extensions/market/templates/market/index.html
+++ b/lnbits/extensions/market/templates/market/index.html
@@ -60,7 +60,8 @@
           @click="marketDialog.show = true"
           >Create Market
           <q-tooltip>
-            Makes a simple frontend market for your stalls (not NOSTR)</q-tooltip
+            Makes a simple frontend market for your stalls (not
+            NOSTR)</q-tooltip
           ></q-btn
         >
       </q-card-section>
@@ -596,7 +597,9 @@
         this.$q.localStorage.set(`lnbits.market.${this.g.user.id}`, this.keys)
       },
       restoreKeys() {
-        let keys = this.$q.localStorage.getItem(`lnbits.market.${this.g.user.id}`)
+        let keys = this.$q.localStorage.getItem(
+          `lnbits.market.${this.g.user.id}`
+        )
         if (keys) {
           this.keys = keys
           this.stallDialog.data.publickey = this.keys.pubkey
@@ -1027,7 +1030,11 @@
       ////////////////////////////////////////
       getMarkets() {
         LNbits.api
-          .request('GET', '/market/api/v1/markets', this.g.user.wallets[0].inkey)
+          .request(
+            'GET',
+            '/market/api/v1/markets',
+            this.g.user.wallets[0].inkey
+          )
           .then(response => {
             if (response.data) {
               this.markets = response.data.map(mapMarkets)
@@ -1318,7 +1325,9 @@
         } else {
           ws_scheme = 'ws://'
         }
-        ws = new WebSocket(ws_scheme + location.host + '/market/ws/' + room_name)
+        ws = new WebSocket(
+          ws_scheme + location.host + '/market/ws/' + room_name
+        )
 
         ws.onmessage = async event => {
           let event_data = JSON.parse(event.data)
@@ -1359,7 +1368,9 @@
         await this.getOrders()
         this.getMarkets()
         await this.getAllMessages()
-        let keys = this.$q.localStorage.getItem(`lnbits.market.${this.g.user.id}`)
+        let keys = this.$q.localStorage.getItem(
+          `lnbits.market.${this.g.user.id}`
+        )
         if (keys) {
           this.keys = keys
         }
diff --git a/lnbits/extensions/market/templates/market/order.html b/lnbits/extensions/market/templates/market/order.html
index ebabe882..5be606f9 100644
--- a/lnbits/extensions/market/templates/market/order.html
+++ b/lnbits/extensions/market/templates/market/order.html
@@ -443,7 +443,9 @@
         } else {
           ws_scheme = 'ws://'
         }
-        ws = new WebSocket(ws_scheme + location.host + '/market/ws/' + room_name)
+        ws = new WebSocket(
+          ws_scheme + location.host + '/market/ws/' + room_name
+        )
 
         ws.onmessage = event => {
           let event_data = JSON.parse(event.data)
diff --git a/lnbits/extensions/market/views_api.py b/lnbits/extensions/market/views_api.py
index 8d0202a3..045bc0fc 100644
--- a/lnbits/extensions/market/views_api.py
+++ b/lnbits/extensions/market/views_api.py
@@ -422,7 +422,9 @@ async def api_market_order_shipped(
 async def api_market_markets(wallet: WalletTypeInfo = Depends(get_key_type)):
     # await get_market_market_stalls(market_id="FzpWnMyHQMcRppiGVua4eY")
     try:
-        return [market.dict() for market in await get_market_markets(wallet.wallet.user)]
+        return [
+            market.dict() for market in await get_market_markets(wallet.wallet.user)
+        ]
     except:
         return {"message": "We could not retrieve the markets."}
 

From 4ff0d0a799e2074d3fa81b366a773a0fd2e9f7c3 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Wed, 4 Jan 2023 21:17:04 +0000
Subject: [PATCH 174/174] Name Tweak

---
 lnbits/extensions/market/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/market/config.json b/lnbits/extensions/market/config.json
index b540189e..8a294867 100644
--- a/lnbits/extensions/market/config.json
+++ b/lnbits/extensions/market/config.json
@@ -1,6 +1,6 @@
 {
-  "name": "Market",
-  "short_description": "Webmarket on LNbits",
+  "name": "Marketplace",
+  "short_description": "Webshop/market on LNbits",
 	"tile": "/market/static/images/bitcoin-shop.png",
   "contributors": ["benarc", "talvasconcelos"]
 }