- This extension allows you to connect a Bleskomat ATM to an lnbits - wallet. It will work with both the - open-source DIY Bleskomat ATM project - as well as the - commercial Bleskomat ATM. -
-Connect Your Bleskomat ATM
-
-
- -
-
- Click the "Add Bleskomat" button on this page to begin. -
- - Choose a wallet. This will be the wallet that is used to pay - satoshis to your ATM customers. - -
- - Choose the fiat currency. This should match the fiat currency that - your ATM accepts. - -
- - Pick an exchange rate provider. This is the API that will be used to - query the fiat to satoshi exchange rate at the time your customer - attempts to withdraw their funds. - -
- Set your ATM's fee percentage. -
- Click the "Done" button. -
- - Find the new Bleskomat in the list and then click the export icon to - download a new configuration file for your ATM. - -
- - Copy the configuration file ("bleskomat.conf") to your ATM's SD - card. - -
- - Restart Your Bleskomat ATM. It should automatically reload the - configurations from the SD card. - -
How does it work?
-- Since the Bleskomat ATMs are designed to be offline, a cryptographic - signing scheme is used to verify that the URL was generated by an - authorized device. When one of your customers inserts fiat money into - the device, a signed URL (lnurl-withdraw) is created and displayed as a - QR code. Your customer scans the QR code with their lnurl-supporting - mobile app, their mobile app communicates with the web API of lnbits to - verify the signature, the fiat currency amount is converted to sats, the - customer accepts the withdrawal, and finally lnbits will pay the - customer from your lnbits wallet. -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %}
diff --git a/lnbits/extensions/bleskomat/views.py b/lnbits/extensions/bleskomat/views.py
deleted file mode 100644
index 4e57e9c2..00000000
--- a/lnbits/extensions/bleskomat/views.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from quart import g, render_template
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import bleskomat_ext
-
-from .exchange_rates import exchange_rate_providers_serializable, fiat_currencies
-from .helpers import get_callback_url
-from fastapi.templating import Jinja2Templates
-from fastapi import Request
-
-templates = Jinja2Templates(directory="templates")
-
-@bleskomat_ext.get("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- bleskomat_vars = {
- "callback_url": get_callback_url(),
- "exchange_rate_providers": exchange_rate_providers_serializable,
- "fiat_currencies": fiat_currencies,
- }
- return await templates.TemplateResponse("bleskomat/index.html", {"request": request, "user":g.user, "bleskomat_vars":bleskomat_vars})
-
diff --git a/lnbits/extensions/bleskomat/views_api.py b/lnbits/extensions/bleskomat/views_api.py
deleted file mode 100644
index a2aea00f..00000000
--- a/lnbits/extensions/bleskomat/views_api.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from typing import Union
-from fastapi.param_functions import Query
-from pydantic import BaseModel
-from quart import g, jsonify, request
-from http import HTTPStatus
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-
-from . import bleskomat_ext
-from .crud import (
- create_bleskomat,
- get_bleskomat,
- get_bleskomats,
- update_bleskomat,
- delete_bleskomat,
-)
-
-from .exchange_rates import (
- exchange_rate_providers,
- fetch_fiat_exchange_rate,
- fiat_currencies,
-)
-
-
-@bleskomat_ext.get("/api/v1/bleskomats")
-@api_check_wallet_key("admin")
-async def api_bleskomats():
- wallet_ids = [g.wallet.id]
-
- if "all_wallets" in request.args:
- wallet_ids = (await get_user(g.wallet.user)).wallet_ids
-
- return (
- [bleskomat._asdict() for bleskomat in await get_bleskomats(wallet_ids)],
- HTTPStatus.OK,
- )
-
-
-@bleskomat_ext.get("/api/v1/bleskomat/{bleskomat_id}")
-@api_check_wallet_key("admin")
-async def api_bleskomat_retrieve(bleskomat_id):
- bleskomat = await get_bleskomat(bleskomat_id)
-
- if not bleskomat or bleskomat.wallet != g.wallet.id:
- return (
- jsonify({"message": "Bleskomat configuration not found."}),
- HTTPStatus.NOT_FOUND,
- )
-
- return jsonify(bleskomat._asdict()), HTTPStatus.OK
-
-
-class CreateData(BaseModel):
- name: str
- fiat_currency: str = "EUR" # TODO: fix this
- exchange_rate_provider: str = "bitfinex"
- fee: Union[str, int, float] = Query(...)
-
-@bleskomat_ext.post("/api/v1/bleskomat")
-@bleskomat_ext.put("/api/v1/bleskomat/{bleskomat_id}")
-@api_check_wallet_key("admin")
-async def api_bleskomat_create_or_update(data: CreateData, bleskomat_id=None):
- try:
- fiat_currency = data.fiat_currency
- exchange_rate_provider = data.exchange_rate_provider
- await fetch_fiat_exchange_rate(
- currency=fiat_currency, provider=exchange_rate_provider
- )
- except Exception as e:
- print(e)
- return (
- {
- "message": f'Failed to fetch BTC/{fiat_currency} currency pair from "{exchange_rate_provider}"'
- },
- HTTPStatus.INTERNAL_SERVER_ERROR,
- )
-
- if bleskomat_id:
- bleskomat = await get_bleskomat(bleskomat_id)
- if not bleskomat or bleskomat.wallet != g.wallet.id:
- return (
- jsonify({"message": "Bleskomat configuration not found."}),
- HTTPStatus.NOT_FOUND,
- )
- bleskomat = await update_bleskomat(bleskomat_id, **data)
- else:
- bleskomat = await create_bleskomat(wallet_id=g.wallet.id, **data)
-
- return (
- bleskomat._asdict(),
- HTTPStatus.OK if bleskomat_id else HTTPStatus.CREATED,
- )
-
-
-@bleskomat_ext.delete("/api/v1/bleskomat/{bleskomat_id}")
-@api_check_wallet_key("admin")
-async def api_bleskomat_delete(bleskomat_id):
- bleskomat = await get_bleskomat(bleskomat_id)
-
- if not bleskomat or bleskomat.wallet != g.wallet.id:
- return (
- jsonify({"message": "Bleskomat configuration not found."}),
- HTTPStatus.NOT_FOUND,
- )
-
- await delete_bleskomat(bleskomat_id)
-
- return "", HTTPStatus.NO_CONTENT
diff --git a/lnbits/extensions/captcha/README.md b/lnbits/extensions/captcha/README.md
deleted file mode 100644
index 27729459..00000000
--- a/lnbits/extensions/captcha/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- Add Bleskomat
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
- Export Configuration
-
-
-
- {{ col.value }}
-
-
-
- Edit
-
-
- Delete
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
- Bleskomats
-
-
-
-
-
- {% include "bleskomat/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} Bleskomat extension -
-
- Update Bleskomat
- Add Bleskomat
- Cancel
-
- Example Extension
-*tagline*
-This is an example extension to help you organise and build you own. - -Try to include an image -
-
-
-If your extension has API endpoints, include useful ones here
- -curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "X-Api-Key: YOUR_WALLET-ADMIN/INVOICE-KEY"
diff --git a/lnbits/extensions/captcha/__init__.py b/lnbits/extensions/captcha/__init__.py
deleted file mode 100644
index f25dccce..00000000
--- a/lnbits/extensions/captcha/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from quart import Blueprint
-from lnbits.db import Database
-
-db = Database("ext_captcha")
-
-captcha_ext: Blueprint = Blueprint(
- "captcha", __name__, static_folder="static", template_folder="templates"
-)
-
-
-from .views_api import * # noqa
-from .views import * # noqa
diff --git a/lnbits/extensions/captcha/config.json b/lnbits/extensions/captcha/config.json
deleted file mode 100644
index 4ef7c43f..00000000
--- a/lnbits/extensions/captcha/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "Captcha",
- "short_description": "Create captcha to stop spam",
- "icon": "block",
- "contributors": ["pseudozach"]
-}
diff --git a/lnbits/extensions/captcha/crud.py b/lnbits/extensions/captcha/crud.py
deleted file mode 100644
index 43a0374e..00000000
--- a/lnbits/extensions/captcha/crud.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from typing import List, Optional, Union
-
-from lnbits.helpers import urlsafe_short_hash
-
-from . import db
-from .models import Captcha
-
-
-async def create_captcha(
- *,
- wallet_id: str,
- url: str,
- memo: str,
- description: Optional[str] = None,
- amount: int = 0,
- remembers: bool = True,
-) -> Captcha:
- captcha_id = urlsafe_short_hash()
- await db.execute(
- """
- INSERT INTO captcha.captchas (id, wallet, url, memo, description, amount, remembers)
- VALUES (?, ?, ?, ?, ?, ?, ?)
- """,
- (captcha_id, wallet_id, url, memo, description, amount, int(remembers)),
- )
-
- captcha = await get_captcha(captcha_id)
- assert captcha, "Newly created captcha couldn't be retrieved"
- return captcha
-
-
-async def get_captcha(captcha_id: str) -> Optional[Captcha]:
- row = await db.fetchone(
- "SELECT * FROM captcha.captchas WHERE id = ?", (captcha_id,)
- )
-
- return Captcha.from_row(row) if row else None
-
-
-async def get_captchas(wallet_ids: Union[str, List[str]]) -> List[Captcha]:
- if isinstance(wallet_ids, str):
- wallet_ids = [wallet_ids]
-
- q = ",".join(["?"] * len(wallet_ids))
- rows = await db.fetchall(
- f"SELECT * FROM captcha.captchas WHERE wallet IN ({q})", (*wallet_ids,)
- )
-
- return [Captcha.from_row(row) for row in rows]
-
-
-async def delete_captcha(captcha_id: str) -> None:
- await db.execute("DELETE FROM captcha.captchas WHERE id = ?", (captcha_id,))
diff --git a/lnbits/extensions/captcha/migrations.py b/lnbits/extensions/captcha/migrations.py
deleted file mode 100644
index 744fc506..00000000
--- a/lnbits/extensions/captcha/migrations.py
+++ /dev/null
@@ -1,63 +0,0 @@
-async def m001_initial(db):
- """
- Initial captchas table.
- """
- await db.execute(
- """
- CREATE TABLE captcha.captchas (
- id TEXT PRIMARY KEY,
- wallet TEXT NOT NULL,
- secret TEXT NOT NULL,
- url TEXT NOT NULL,
- memo TEXT NOT NULL,
- amount INTEGER NOT NULL,
- time TIMESTAMP NOT NULL DEFAULT """
- + db.timestamp_now
- + """
- );
- """
- )
-
-
-async def m002_redux(db):
- """
- Creates an improved captchas table and migrates the existing data.
- """
- await db.execute("ALTER TABLE captcha.captchas RENAME TO captchas_old")
- await db.execute(
- """
- CREATE TABLE captcha.captchas (
- id TEXT PRIMARY KEY,
- wallet TEXT NOT NULL,
- url TEXT NOT NULL,
- memo TEXT NOT NULL,
- description TEXT NULL,
- amount INTEGER DEFAULT 0,
- time TIMESTAMP NOT NULL DEFAULT """
- + db.timestamp_now
- + """,
- remembers INTEGER DEFAULT 0,
- extras TEXT NULL
- );
- """
- )
-
- for row in [
- list(row) for row in await db.fetchall("SELECT * FROM captcha.captchas_old")
- ]:
- await db.execute(
- """
- INSERT INTO captcha.captchas (
- id,
- wallet,
- url,
- memo,
- amount,
- time
- )
- VALUES (?, ?, ?, ?, ?, ?)
- """,
- (row[0], row[1], row[3], row[4], row[5], row[6]),
- )
-
- await db.execute("DROP TABLE captcha.captchas_old")
diff --git a/lnbits/extensions/captcha/models.py b/lnbits/extensions/captcha/models.py
deleted file mode 100644
index 2b98a91e..00000000
--- a/lnbits/extensions/captcha/models.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import json
-
-from sqlite3 import Row
-from pydantic import BaseModel
-from typing import Optional
-
-
-class Captcha(BaseModel):
- id: str
- wallet: str
- url: str
- memo: str
- description: str
- amount: int
- time: int
- remembers: bool
- extras: Optional[dict]
-
- @classmethod
- def from_row(cls, row: Row) -> "Captcha":
- data = dict(row)
- data["remembers"] = bool(data["remembers"])
- data["extras"] = json.loads(data["extras"]) if data["extras"] else None
- return cls(**data)
diff --git a/lnbits/extensions/captcha/static/js/captcha.js b/lnbits/extensions/captcha/static/js/captcha.js
deleted file mode 100644
index 1da24f57..00000000
--- a/lnbits/extensions/captcha/static/js/captcha.js
+++ /dev/null
@@ -1,82 +0,0 @@
-var ciframeLoaded = !1,
- captchaStyleAdded = !1
-
-function ccreateIframeElement(t = {}) {
- const e = document.createElement('iframe')
- // e.style.marginLeft = "25px",
- ;(e.style.border = 'none'),
- (e.style.width = '100%'),
- (e.style.height = '100%'),
- (e.scrolling = 'no'),
- (e.id = 'captcha-iframe')
- t.dest, t.amount, t.currency, t.label, t.opReturn
- var captchaid = document
- .getElementById('captchascript')
- .getAttribute('data-captchaid')
- var lnbhostsrc = document.getElementById('captchascript').getAttribute('src')
- var lnbhost = lnbhostsrc.split('/captcha/static/js/captcha.js')[0]
- return (e.src = lnbhost + '/captcha/' + captchaid), e
-}
-document.addEventListener('DOMContentLoaded', function () {
- if (captchaStyleAdded) console.log('Captcha already added!')
- else {
- console.log('Adding captcha'), (captchaStyleAdded = !0)
- var t = document.createElement('style')
- t.innerHTML =
- "\t/*Button*/\t\t.button-captcha-filled\t\t\t{\t\t\tdisplay: flex;\t\t\talign-items: center;\t\t\tjustify-content: center;\t\t\twidth: 120px;\t\t\tmin-width: 30px;\t\t\theight: 40px;\t\t\tline-height: 2.5;\t\t\ttext-align: center;\t\t\tcursor: pointer;\t\t\t/* Rectangle 2: */\t\t\tbackground: #FF7979;\t\t\tbox-shadow: 0 2px 4px 0 rgba(0,0,0,0.20);\t\t\tborder-radius: 20px;\t\t\t/* Sign up: */\t\t\tfont-family: 'Avenir-Heavy', Futura, Helvetica, Arial;\t\t\tfont-size: 16px;\t\t\tcolor: #FFFFFF;\t\t}\t\t.button-captcha-filled:hover\t\t{\t\t\tbackground:#FFFFFF;\t\t\tcolor: #FF7979;\t\t\tbox-shadow: 0 0 4px 0 rgba(0,0,0,0.20);\t\t}\t\t.button-captcha-filled:active\t\t{\t\t\tbackground:#FFFFFF;\t\t\tcolor: #FF7979;\t\t\t/*Move it down a little bit*/\t\t\tposition: relative;\t\t\ttop: 1px;\t\t}\t\t.button-captcha-filled-dark\t\t\t{\t\t\tdisplay: flex;\t\t\talign-items: center;\t\t\tjustify-content: center;\t\t\twidth: 120px;\t\t\tmin-width: 30px;\t\t\theight: 40px;\t\t\tline-height: 2.5;\t\t\ttext-align: center;\t\t\tcursor: pointer;\t\t\t/* Rectangle 2: */\t\t\tbackground: #161C38;\t\t\tbox-shadow: 0 0px 4px 0 rgba(0,0,0,0.20);\t\t\tborder-radius: 20px;\t\t\t/* Sign up: */\t\t\tfont-family: 'Avenir-Heavy', Futura, Helvetica, Arial;\t\t\tfont-size: 16px;\t\t\tcolor: #FFFFFF;\t\t}\t\t.button-captcha-filled-dark:hover\t\t{\t\t\tbackground:#FFFFFF;\t\t\tcolor: #161C38;\t\t\tbox-shadow: 0 0px 4px 0 rgba(0,0,0,0.20);\t\t}\t\t.button-captcha-filled-dark:active\t\t{\t\t\tbackground:#FFFFFF;\t\t\tcolor: #161C38;\t\t\t/*Move it down a little bit*/\t\t\tposition: relative;\t\t\ttop: 1px;\t\t}\t\t.modal-captcha-container {\t\t position: fixed;\t\t z-index: 1000;\t\t text-align: left;/*Si no añado esto, a veces hereda el text-align:center del body, y entonces el popup queda movido a la derecha, por center + margin left que aplico*/\t\t left: 0;\t\t top: 0;\t\t width: 100%;\t\t height: 100%;\t\t background-color: rgba(0, 0, 0, 0.5);\t\t opacity: 0;\t\t visibility: hidden;\t\t transform: scale(1.1);\t\t transition: visibility 0s linear 0.25s, opacity 0.25s 0s, transform 0.25s;\t\t}\t\t.modal-captcha-content {\t\t position: absolute;\t\t top: 50%;\t\t left: 50%;\t\t transform: translate(-50%, -50%);\t\t background-color: white;\t\t width: 100%;\t\t height: 100%;\t\t border-radius: 0.5rem;\t\t /*Rounded shadowed borders*/\t\t\tbox-shadow: 2px 2px 4px 0 rgba(0,0,0,0.15);\t\t\tborder-radius: 5px;\t\t}\t\t.close-button-captcha {\t\t float: right;\t\t width: 1.5rem;\t\t line-height: 1.5rem;\t\t text-align: center;\t\t cursor: pointer;\t\t margin-right:20px;\t\t margin-top:10px;\t\t border-radius: 0.25rem;\t\t background-color: lightgray;\t\t}\t\t.close-button-captcha:hover {\t\t background-color: darkgray;\t\t}\t\t.show-modal-captcha {\t\t opacity: 1;\t\t visibility: visible;\t\t transform: scale(1.0);\t\t transition: visibility 0s linear 0s, opacity 0.25s 0s, transform 0.25s;\t\t}\t\t/* Mobile */\t\t@media screen and (min-device-width: 160px) and ( max-width: 1077px ) /*No tendria ni por que poner un min-device, porq abarca todo lo humano...*/\t\t{\t\t}"
- var e = document.querySelector('script')
- e.parentNode.insertBefore(t, e)
- var i = document.getElementById('captchacheckbox'),
- n = i.dataset,
- o = 'true' === n.dark
- var a = document.createElement('div')
- ;(a.className += ' modal-captcha-container'),
- (a.innerHTML =
- '\t\t \t\t\t
\t'),
- document.getElementsByTagName('body')[0].appendChild(a)
- var r = document.getElementsByClassName('modal-captcha-content').item(0)
- document
- .getElementsByClassName('close-button-captcha')
- .item(0)
- .addEventListener('click', d),
- window.addEventListener('click', function (t) {
- t.target === a && d()
- }),
- i.addEventListener('change', function () {
- if (this.checked) {
- // console.log("checkbox checked");
- if (0 == ciframeLoaded) {
- // console.log("n: ", n);
- var t = ccreateIframeElement(n)
- r.appendChild(t), (ciframeLoaded = !0)
- }
- d()
- }
- })
- }
-
- function d() {
- a.classList.toggle('show-modal-captcha')
- }
-})
-
-function receiveMessage(event) {
- if (event.data.includes('paymenthash')) {
- // console.log("paymenthash received: ", event.data);
- document.getElementById('captchapayhash').value = event.data.split('_')[1]
- }
- if (event.data.includes('removetheiframe')) {
- if (event.data.includes('nok')) {
- //invoice was NOT paid
- // console.log("receiveMessage not paid")
- document.getElementById('captchacheckbox').checked = false
- }
- ciframeLoaded = !1
- var element = document.getElementById('captcha-iframe')
- document
- .getElementsByClassName('modal-captcha-container')[0]
- .classList.toggle('show-modal-captcha')
- element.parentNode.removeChild(element)
- }
-}
-window.addEventListener('message', receiveMessage, false)
diff --git a/lnbits/extensions/captcha/templates/captcha/_api_docs.html b/lnbits/extensions/captcha/templates/captcha/_api_docs.html
deleted file mode 100644
index dfe2f32f..00000000
--- a/lnbits/extensions/captcha/templates/captcha/_api_docs.html
+++ /dev/null
@@ -1,147 +0,0 @@
-GET /captcha/api/v1/captchas
- Headers
-{"X-Api-Key": <invoice_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-[<captcha_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}captcha/api/v1/captchas -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- POST /captcha/api/v1/captchas
- Headers
-{"X-Api-Key": <admin_key>}-
Body (application/json)
-{"amount": <integer>, "description": <string>, "memo":
- <string>, "remembers": <boolean>, "url":
- <string>}
- - Returns 201 CREATED (application/json) -
-{"amount": <integer>, "description": <string>, "id":
- <string>, "memo": <string>, "remembers": <boolean>,
- "time": <int>, "url": <string>, "wallet":
- <string>}
- Curl example
-curl -X POST {{ request.url_root }}captcha/api/v1/captchas -d
- '{"url": <string>, "memo": <string>, "description":
- <string>, "amount": <integer>, "remembers":
- <boolean>}' -H "Content-type: application/json" -H "X-Api-Key:
- {{ g.user.wallets[0].adminkey }}"
-
- POST
- /captcha/api/v1/captchas/<captcha_id>/invoice
- Body (application/json)
-{"amount": <integer>}
- - Returns 201 CREATED (application/json) -
-{"payment_hash": <string>, "payment_request":
- <string>}
- Curl example
-curl -X POST {{ request.url_root
- }}captcha/api/v1/captchas/<captcha_id>/invoice -d '{"amount":
- <integer>}' -H "Content-type: application/json"
-
- POST
- /captcha/api/v1/captchas/<captcha_id>/check_invoice
- Body (application/json)
-{"payment_hash": <string>}
- - Returns 200 OK (application/json) -
-{"paid": false}-
{"paid": true, "url": <string>, "remembers":
- <boolean>}
- Curl example
-curl -X POST {{ request.url_root
- }}captcha/api/v1/captchas/<captcha_id>/check_invoice -d
- '{"payment_hash": <string>}' -H "Content-type: application/json"
-
- DELETE
- /captcha/api/v1/captchas/<captcha_id>
- Headers
-{"X-Api-Key": <admin_key>}-
Returns 204 NO CONTENT
-Curl example
-curl -X DELETE {{ request.url_root
- }}captcha/api/v1/captchas/<captcha_id> -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
-
-
-
-{% endblock %} {% block scripts %}
-
-{% endblock %}
diff --git a/lnbits/extensions/captcha/templates/captcha/index.html b/lnbits/extensions/captcha/templates/captcha/index.html
deleted file mode 100644
index 45318f08..00000000
--- a/lnbits/extensions/captcha/templates/captcha/index.html
+++ /dev/null
@@ -1,427 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-
-
-
-
-
-
-{{ captcha.memo }}
- {% if captcha.description %} -{{ captcha.description }}
- {% endif %} -
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copy invoice
- Cancel
-
-
-
-
- Captcha accepted. You are probably human.
-
-
-
-
-
-
-
-
-
-
-
-
-
- Remember payments
- A succesful payment will be registered in the browser's
- storage, so the user doesn't need to pay again to prove they are
- human.
-
-
-
-
-
-
-
-
-
- {% raw %}
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/captcha/views.py b/lnbits/extensions/captcha/views.py
deleted file mode 100644
index eb2bce0d..00000000
--- a/lnbits/extensions/captcha/views.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from quart import g, abort, render_template
-from http import HTTPStatus
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import captcha_ext
-from .crud import get_captcha
-from fastapi.templating import Jinja2Templates
-from fastapi import Request
-templates = Jinja2Templates(directory="templates")
-
-@captcha_ext.route("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index():
- return await render_template("captcha/index.html", user=g.user)
-
-
-@captcha_ext.route("/{captcha_id}")
-async def display(request: Request, captcha_id):
- captcha = await get_captcha(captcha_id) or abort(
- HTTPStatus.NOT_FOUND, "captcha does not exist."
- )
- return await templates.TemplateResponse("captcha/display.html", {"request": request, "captcha": captcha})
diff --git a/lnbits/extensions/captcha/views_api.py b/lnbits/extensions/captcha/views_api.py
deleted file mode 100644
index 39d5da69..00000000
--- a/lnbits/extensions/captcha/views_api.py
+++ /dev/null
@@ -1,121 +0,0 @@
-from quart import g, jsonify, request
-from http import HTTPStatus
-
-from lnbits.core.crud import get_user, get_wallet
-from lnbits.core.services import create_invoice, check_invoice_status
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-
-from . import captcha_ext
-from .crud import create_captcha, get_captcha, get_captchas, delete_captcha
-
-
-@captcha_ext.get("/api/v1/captchas")
-@api_check_wallet_key("invoice")
-async def api_captchas():
- wallet_ids = [g.wallet.id]
-
- if "all_wallets" in request.args:
- wallet_ids = (await get_user(g.wallet.user)).wallet_ids
-
- return (
- jsonify([captcha._asdict() for captcha in await get_captchas(wallet_ids)]),
- HTTPStatus.OK,
- )
-
-
-@captcha_ext.post("/api/v1/captchas")
-@api_check_wallet_key("invoice")
-@api_validate_post_request(
- schema={
- "url": {"type": "string", "empty": False, "required": True},
- "memo": {"type": "string", "empty": False, "required": True},
- "description": {
- "type": "string",
- "empty": True,
- "nullable": True,
- "required": False,
- },
- "amount": {"type": "integer", "min": 0, "required": True},
- "remembers": {"type": "boolean", "required": True},
- }
-)
-async def api_captcha_create():
- captcha = await create_captcha(wallet_id=g.wallet.id, **g.data)
- return jsonify(captcha._asdict()), HTTPStatus.CREATED
-
-
-@captcha_ext.delete("/api/v1/captchas/{captcha_id}")
-@api_check_wallet_key("invoice")
-async def api_captcha_delete(captcha_id):
- captcha = await get_captcha(captcha_id)
-
- if not captcha:
- return jsonify({"message": "captcha does not exist."}), HTTPStatus.NOT_FOUND
-
- if captcha.wallet != g.wallet.id:
- return jsonify({"message": "Not your captcha."}), HTTPStatus.FORBIDDEN
-
- await delete_captcha(captcha_id)
-
- return "", HTTPStatus.NO_CONTENT
-
-
-@captcha_ext.post("/api/v1/captchas/{captcha_id}/invoice")
-@api_validate_post_request(
- schema={"amount": {"type": "integer", "min": 1, "required": True}}
-)
-async def api_captcha_create_invoice(captcha_id):
- captcha = await get_captcha(captcha_id)
-
- if g.data["amount"] < captcha.amount:
- return (
- jsonify({"message": f"Minimum amount is {captcha.amount} sat."}),
- HTTPStatus.BAD_REQUEST,
- )
-
- try:
- amount = (
- g.data["amount"] if g.data["amount"] > captcha.amount else captcha.amount
- )
- payment_hash, payment_request = await create_invoice(
- wallet_id=captcha.wallet,
- amount=amount,
- memo=f"{captcha.memo}",
- extra={"tag": "captcha"},
- )
- except Exception as e:
- return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
-
- return (
- jsonify({"payment_hash": payment_hash, "payment_request": payment_request}),
- HTTPStatus.CREATED,
- )
-
-
-@captcha_ext.post("/api/v1/captchas/{captcha_id}/check_invoice")
-@api_validate_post_request(
- schema={"payment_hash": {"type": "string", "empty": False, "required": True}}
-)
-async def api_paywal_check_invoice(captcha_id):
- captcha = await get_captcha(captcha_id)
-
- if not captcha:
- return {"message": "captcha does not exist."}, HTTPStatus.NOT_FOUND
-
- try:
- status = await check_invoice_status(captcha.wallet, g.data["payment_hash"])
- is_paid = not status.pending
- except Exception:
- return {"paid": False}, HTTPStatus.OK
-
- if is_paid:
- wallet = await get_wallet(captcha.wallet)
- payment = await wallet.get_payment(g.data["payment_hash"])
- await payment.set_pending(False)
-
- return (
- {"paid": True, "url": captcha.url, "remembers": captcha.remembers},
- HTTPStatus.OK,
- )
-
- return {"paid": False}, HTTPStatus.OK
diff --git a/lnbits/extensions/copilot/README.md b/lnbits/extensions/copilot/README.md
deleted file mode 100644
index 323aeddc..00000000
--- a/lnbits/extensions/copilot/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# StreamerCopilot
-
-Tool to help streamers accept sats for tips
diff --git a/lnbits/extensions/copilot/__init__.py b/lnbits/extensions/copilot/__init__.py
deleted file mode 100644
index b255282b..00000000
--- a/lnbits/extensions/copilot/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from quart import Blueprint
-from lnbits.db import Database
-
-db = Database("ext_copilot")
-
-copilot_ext: Blueprint = Blueprint(
- "copilot", __name__, static_folder="static", template_folder="templates"
-)
-
-from .views_api import * # noqa
-from .views import * # noqa
-from .lnurl import * # noqa
-from .tasks import register_listeners
-
-from lnbits.tasks import record_async
-
-copilot_ext.record(record_async(register_listeners))
diff --git a/lnbits/extensions/copilot/config.json b/lnbits/extensions/copilot/config.json
deleted file mode 100644
index e17389e7..00000000
--- a/lnbits/extensions/copilot/config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "StreamerCopilot",
- "short_description": "Video tips/animations/webhooks",
- "icon": "face",
- "contributors": [
- "arcbtc"
- ]
-}
diff --git a/lnbits/extensions/copilot/crud.py b/lnbits/extensions/copilot/crud.py
deleted file mode 100644
index d083675e..00000000
--- a/lnbits/extensions/copilot/crud.py
+++ /dev/null
@@ -1,107 +0,0 @@
-from typing import List, Optional, Union
-
-# from lnbits.db import open_ext_db
-from . import db
-from .models import Copilots
-
-from lnbits.helpers import urlsafe_short_hash
-
-from quart import jsonify
-
-
-###############COPILOTS##########################
-
-
-async def create_copilot(
- title: str,
- user: str,
- lnurl_toggle: Optional[int] = 0,
- wallet: Optional[str] = None,
- animation1: Optional[str] = None,
- animation2: Optional[str] = None,
- animation3: Optional[str] = None,
- animation1threshold: Optional[int] = None,
- animation2threshold: Optional[int] = None,
- animation3threshold: Optional[int] = None,
- animation1webhook: Optional[str] = None,
- animation2webhook: Optional[str] = None,
- animation3webhook: Optional[str] = None,
- lnurl_title: Optional[str] = None,
- show_message: Optional[int] = 0,
- show_ack: Optional[int] = 0,
- show_price: Optional[str] = None,
- amount_made: Optional[int] = None,
-) -> Copilots:
- copilot_id = urlsafe_short_hash()
-
- await db.execute(
- """
- INSERT INTO copilot.copilots (
- id,
- "user",
- lnurl_toggle,
- wallet,
- title,
- animation1,
- animation2,
- animation3,
- animation1threshold,
- animation2threshold,
- animation3threshold,
- animation1webhook,
- animation2webhook,
- animation3webhook,
- lnurl_title,
- show_message,
- show_ack,
- show_price,
- amount_made
- )
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
- """,
- (
- copilot_id,
- user,
- int(lnurl_toggle),
- wallet,
- title,
- animation1,
- animation2,
- animation3,
- animation1threshold,
- animation2threshold,
- animation3threshold,
- animation1webhook,
- animation2webhook,
- animation3webhook,
- lnurl_title,
- int(show_message),
- int(show_ack),
- show_price,
- 0,
- ),
- )
- return await get_copilot(copilot_id)
-
-
-async def update_copilot(copilot_id: str, **kwargs) -> Optional[Copilots]:
- q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
- await db.execute(
- f"UPDATE copilot.copilots SET {q} WHERE id = ?", (*kwargs.values(), copilot_id)
- )
- row = await db.fetchone("SELECT * FROM copilot.copilots WHERE id = ?", (copilot_id,))
- return Copilots.from_row(row) if row else None
-
-
-async def get_copilot(copilot_id: str) -> Copilots:
- row = await db.fetchone("SELECT * FROM copilot.copilots WHERE id = ?", (copilot_id,))
- return Copilots.from_row(row) if row else None
-
-
-async def get_copilots(user: str) -> List[Copilots]:
- rows = await db.fetchall("""SELECT * FROM copilot.copilots WHERE "user" = ?""", (user,))
- return [Copilots.from_row(row) for row in rows]
-
-
-async def delete_copilot(copilot_id: str) -> None:
- await db.execute("DELETE FROM copilot.copilots WHERE id = ?", (copilot_id,))
diff --git a/lnbits/extensions/copilot/lnurl.py b/lnbits/extensions/copilot/lnurl.py
deleted file mode 100644
index 0a10e29b..00000000
--- a/lnbits/extensions/copilot/lnurl.py
+++ /dev/null
@@ -1,86 +0,0 @@
-import json
-import hashlib
-import math
-from quart import jsonify, url_for, request
-from lnurl import LnurlPayResponse, LnurlPayActionResponse, LnurlErrorResponse # type: ignore
-from lnurl.types import LnurlPayMetadata
-from lnbits.core.services import create_invoice
-
-from . import copilot_ext
-from .crud import get_copilot
-
-
-@copilot_ext.route("/lnurl/
-
-
- New captcha
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
- Captchas
-
- Export to CSV
-
-
-
-
-
-
- {% include "captcha/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} captcha extension -
-
- Create captcha
- Cancel
-
-
- {{ qrCodeDialog.data.snippet }}
-
- - Copy the snippet above and paste into your website/form. The checkbox - can be in checked state only after user pays. -
-
- ID: {{ qrCodeDialog.data.id }}
- Amount: {{ qrCodeDialog.data.amount }}
-
-
- Copy Snippet
-
- Close
-
-
- StreamerCopilot: get tips via static QR (lnurl-pay) and show an
- animation
-
- Created by, Ben Arc
-
POST /copilot/api/v1/copilot
- Headers
-{"X-Api-Key": <admin_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<copilot_object>, ...]
- Curl example
-curl -X POST {{ request.url_root }}api/v1/copilot -d '{"title":
- <string>, "animation": <string>,
- "show_message":<string>, "amount": <integer>,
- "lnurl_title": <string>}' -H "Content-type: application/json"
- -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
-
- PUT
- /copilot/api/v1/copilot/<copilot_id>
- Headers
-{"X-Api-Key": <admin_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<copilot_object>, ...]
- Curl example
-curl -X POST {{ request.url_root
- }}api/v1/copilot/<copilot_id> -d '{"title": <string>,
- "animation": <string>, "show_message":<string>,
- "amount": <integer>, "lnurl_title": <string>}' -H
- "Content-type: application/json" -H "X-Api-Key:
- {{g.user.wallets[0].adminkey }}"
-
- GET
- /copilot/api/v1/copilot/<copilot_id>
- Headers
-{"X-Api-Key": <invoice_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<copilot_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/copilot/<copilot_id>
- -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- GET /copilot/api/v1/copilots
- Headers
-{"X-Api-Key": <invoice_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<copilot_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/copilots -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- DELETE
- /copilot/api/v1/copilot/<copilot_id>
- Headers
-{"X-Api-Key": <admin_key>}-
Returns 204 NO CONTENT
-Curl example
-curl -X DELETE {{ request.url_root
- }}api/v1/copilot/<copilot_id> -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
-
- GET
- /api/v1/copilot/ws/<copilot_id>/<comment>/<data>
- Headers
-{"X-Api-Key": <admin_key>}-
Returns 200
-Curl example
-curl -X GET {{ request.url_root }}/api/v1/copilot/ws/<string,
- copilot_id>/<string, comment>/<string, gif name> -H
- "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
-
-
-
-
-
-
- {% raw %}{{ copilot.lnurl_title }}{% endraw %}
-
-
- - {% raw %}{{ price }}{% endraw %} -
-- Powered by LNbits/StreamerCopilot -
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-
-
-{% endblock %}
diff --git a/lnbits/extensions/copilot/templates/copilot/panel.html b/lnbits/extensions/copilot/templates/copilot/panel.html
deleted file mode 100644
index 904ab104..00000000
--- a/lnbits/extensions/copilot/templates/copilot/panel.html
+++ /dev/null
@@ -1,157 +0,0 @@
-{% extends "public.html" %} {% block page %}
-
-
-
- {% raw %}
- New copilot instance
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Panel
-
-
-
-
- Compose window
-
-
-
-
- Delete copilot
-
-
-
-
- Edit copilot
-
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
-
- Copilots
-
-
-
-
- Export to CSV
-
- {{ col.label }}
- {{ col.value }}
-
-
-
-
-
- {% include "copilot/_api_docs.html" %}
-
-
-
- - {{SITE_TITLE}} StreamCopilot Extension -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Update Copilot
- Create Copilot
- Cancel
-
-
-
-
-
-
-{% endblock %} {% block scripts %}
-
-
-{% endblock %}
diff --git a/lnbits/extensions/copilot/views.py b/lnbits/extensions/copilot/views.py
deleted file mode 100644
index 7f5e5d95..00000000
--- a/lnbits/extensions/copilot/views.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from quart import g, abort, render_template, jsonify, websocket
-from http import HTTPStatus
-import httpx
-from collections import defaultdict
-from lnbits.decorators import check_user_exists, validate_uuids
-from . import copilot_ext
-from .crud import get_copilot
-from quart import g, abort, render_template, jsonify, websocket
-from functools import wraps
-import trio
-import shortuuid
-from . import copilot_ext
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@copilot_ext.route("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("copilot/index.html", {"request": request, "user":g.user})
-
-@copilot_ext.route("/cp/")
-async def compose(request: Request):
- return await templates.TemplateResponse("copilot/compose.html", {"request": request})
-
-@copilot_ext.route("/pn/")
-async def panel(request: Request):
- return await templates.TemplateResponse("copilot/panel.html", {"request": request})
-
-
-##################WEBSOCKET ROUTES########################
-
-# socket_relay is a list where the control panel or
-# lnurl endpoints can leave a message for the compose window
-
-connected_websockets = defaultdict(set)
-
-
-@copilot_ext.websocket("/ws/{id}/")
-async def wss(id):
- copilot = await get_copilot(id)
- if not copilot:
- return "", HTTPStatus.FORBIDDEN
- global connected_websockets
- send_channel, receive_channel = trio.open_memory_channel(0)
- connected_websockets[id].add(send_channel)
- try:
- while True:
- data = await receive_channel.receive()
- await websocket.send(data)
- finally:
- connected_websockets[id].remove(send_channel)
-
-
-async def updater(copilot_id, data, comment):
- copilot = await get_copilot(copilot_id)
- if not copilot:
- return
- for queue in connected_websockets[copilot_id]:
- await queue.send(f"{data + '-' + comment}")
diff --git a/lnbits/extensions/copilot/views_api.py b/lnbits/extensions/copilot/views_api.py
deleted file mode 100644
index 77482038..00000000
--- a/lnbits/extensions/copilot/views_api.py
+++ /dev/null
@@ -1,104 +0,0 @@
-import hashlib
-from quart import g, jsonify, url_for, websocket
-from http import HTTPStatus
-import httpx
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-from .views import updater
-
-from . import copilot_ext
-
-from lnbits.extensions.copilot import copilot_ext
-from .crud import (
- create_copilot,
- update_copilot,
- get_copilot,
- get_copilots,
- delete_copilot,
-)
-
-#######################COPILOT##########################
-
-class CreateData(BaseModel):
- title: str
- lnurl_toggle: Optional[int]
- wallet: Optional[str]
- animation1: Optional[str]
- animation2: Optional[str]
- animation3: Optional[str]
- animation1threshold: Optional[int]
- animation2threshold: Optional[int]
- animation2threshold: Optional[int]
- animation1webhook: Optional[str]
- animation2webhook: Optional[str]
- animation3webhook: Optional[str]
- lnurl_title: Optional[str]
- show_message: Optional[int]
- show_ack: Optional[int]
- show_price: Optional[str]
-
-@copilot_ext.post("/api/v1/copilot")
-@copilot_ext.put("/api/v1/copilot/{copilot_id}")
-@api_check_wallet_key("admin")
-async def api_copilot_create_or_update(data: CreateData,copilot_id=None):
- if not copilot_id:
- copilot = await create_copilot(user=g.wallet.user, **data)
- return jsonify(copilot._asdict()), HTTPStatus.CREATED
- else:
- copilot = await update_copilot(copilot_id=copilot_id, **data)
- return jsonify(copilot._asdict()), HTTPStatus.OK
-
-
-@copilot_ext.get("/api/v1/copilot")
-@api_check_wallet_key("invoice")
-async def api_copilots_retrieve():
- try:
- return (
- [{**copilot._asdict()} for copilot in await get_copilots(g.wallet.user)],
- HTTPStatus.OK,
- )
- except:
- return ""
-
-
-@copilot_ext.get("/api/v1/copilot/{copilot_id}")
-@api_check_wallet_key("invoice")
-async def api_copilot_retrieve(copilot_id):
- copilot = await get_copilot(copilot_id)
- if not copilot:
- return {"message": "copilot does not exist"}, HTTPStatus.NOT_FOUND
- if not copilot.lnurl_toggle:
- return (
- {**copilot._asdict()},
- HTTPStatus.OK,
- )
- return (
- {**copilot._asdict(), **{"lnurl": copilot.lnurl}},
- HTTPStatus.OK,
- )
-
-
-@copilot_ext.delete("/api/v1/copilot/{copilot_id}")
-@api_check_wallet_key("admin")
-async def api_copilot_delete(copilot_id):
- copilot = await get_copilot(copilot_id)
-
- if not copilot:
- return {"message": "Wallet link does not exist."}, HTTPStatus.NOT_FOUND
-
- await delete_copilot(copilot_id)
-
- return "", HTTPStatus.NO_CONTENT
-
-
-@copilot_ext.get("/api/v1/copilot/ws/{copilot_id}/{comment}/{data}")
-async def api_copilot_ws_relay(copilot_id, comment, data):
- copilot = await get_copilot(copilot_id)
- if not copilot:
- return {"message": "copilot does not exist"}, HTTPStatus.NOT_FOUND
- try:
- await updater(copilot_id, data, comment)
- except:
- return "", HTTPStatus.FORBIDDEN
- return "", HTTPStatus.OK
diff --git a/lnbits/extensions/diagonalley/README.md b/lnbits/extensions/diagonalley/README.md
deleted file mode 100644
index 6ba653e7..00000000
--- a/lnbits/extensions/diagonalley/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
- Title: {% raw %} {{ copilot.title }} {% endraw %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Diagon Alley
-A movable market stand
-Make a list of products to sell, point the list to an indexer (or many), stack sats. -Diagon Alley is a movable market stand, for anon transactions. You then give permission for an indexer to list those products. Delivery addresses are sent through the Lightning Network. -
-
-
-API endpoints
- -curl -X GET http://YOUR-TOR-ADDRESS
diff --git a/lnbits/extensions/diagonalley/__init__.py b/lnbits/extensions/diagonalley/__init__.py
deleted file mode 100644
index ac907f5c..00000000
--- a/lnbits/extensions/diagonalley/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from quart import Blueprint
-
-
-diagonalley_ext: Blueprint = Blueprint(
- "diagonalley", __name__, static_folder="static", template_folder="templates"
-)
-
-
-from .views_api import * # noqa
-from .views import * # noqa
diff --git a/lnbits/extensions/diagonalley/config.json.example b/lnbits/extensions/diagonalley/config.json.example
deleted file mode 100644
index 057d0f23..00000000
--- a/lnbits/extensions/diagonalley/config.json.example
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "Diagon Alley",
- "short_description": "Movable anonymous market stand",
- "icon": "add_shopping_cart",
- "contributors": ["benarc"]
-}
diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
deleted file mode 100644
index 971cd449..00000000
--- a/lnbits/extensions/diagonalley/crud.py
+++ /dev/null
@@ -1,308 +0,0 @@
-from base64 import urlsafe_b64encode
-from uuid import uuid4
-from typing import List, Optional, Union
-import httpx
-from lnbits.db import open_ext_db
-from lnbits.settings import WALLET
-from .models import Products, Orders, Indexers
-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
-
-
-def create_diagonalleys_product(
- *,
- wallet_id: str,
- product: str,
- categories: str,
- description: str,
- image: str,
- price: int,
- quantity: int,
-) -> Products:
- with open_ext_db("diagonalley") as db:
- product_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
- db.execute(
- """
- INSERT INTO diagonalley.products (id, wallet, product, categories, description, image, price, quantity)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?)
- """,
- (
- product_id,
- wallet_id,
- product,
- categories,
- description,
- image,
- price,
- quantity,
- ),
- )
-
- return get_diagonalleys_product(product_id)
-
-
-def update_diagonalleys_product(product_id: str, **kwargs) -> Optional[Indexers]:
- q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-
- with open_ext_db("diagonalley") as db:
- db.execute(
- f"UPDATE diagonalley.products SET {q} WHERE id = ?",
- (*kwargs.values(), product_id),
- )
- row = db.fetchone(
- "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
- )
-
- return get_diagonalleys_indexer(product_id)
-
-
-def get_diagonalleys_product(product_id: str) -> Optional[Products]:
- with open_ext_db("diagonalley") as db:
- row = db.fetchone(
- "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
- )
-
- return Products(**row) if row else None
-
-
-def get_diagonalleys_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 = db.fetchall(
- f"SELECT * FROM diagonalley.products WHERE wallet IN ({q})", (*wallet_ids,)
- )
-
- return [Products(**row) for row in rows]
-
-
-def delete_diagonalleys_product(product_id: str) -> None:
- with open_ext_db("diagonalley") as db:
- db.execute("DELETE FROM diagonalley.products WHERE id = ?", (product_id,))
-
-
-###Indexers
-
-
-def create_diagonalleys_indexer(
- wallet_id: str,
- shopname: str,
- indexeraddress: str,
- shippingzone1: str,
- shippingzone2: str,
- zone1cost: int,
- zone2cost: int,
- email: str,
-) -> Indexers:
- with open_ext_db("diagonalley") as db:
- indexer_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
- db.execute(
- """
- INSERT INTO diagonalley.indexers (id, wallet, shopname, indexeraddress, online, rating, shippingzone1, shippingzone2, zone1cost, zone2cost, email)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
- """,
- (
- indexer_id,
- wallet_id,
- shopname,
- indexeraddress,
- False,
- 0,
- shippingzone1,
- shippingzone2,
- zone1cost,
- zone2cost,
- email,
- ),
- )
- return get_diagonalleys_indexer(indexer_id)
-
-
-def update_diagonalleys_indexer(indexer_id: str, **kwargs) -> Optional[Indexers]:
- q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-
- with open_ext_db("diagonalley") as db:
- db.execute(
- f"UPDATE diagonalley.indexers SET {q} WHERE id = ?",
- (*kwargs.values(), indexer_id),
- )
- row = db.fetchone(
- "SELECT * FROM diagonalley.indexers WHERE id = ?", (indexer_id,)
- )
-
- return get_diagonalleys_indexer(indexer_id)
-
-
-def get_diagonalleys_indexer(indexer_id: str) -> Optional[Indexers]:
- with open_ext_db("diagonalley") as db:
- roww = db.fetchone(
- "SELECT * FROM diagonalley.indexers WHERE id = ?", (indexer_id,)
- )
- try:
- x = httpx.get(roww["indexeraddress"] + "/" + roww["ratingkey"])
- if x.status_code == 200:
- print(x)
- print("poo")
- with open_ext_db("diagonalley") as db:
- db.execute(
- "UPDATE diagonalley.indexers SET online = ? WHERE id = ?",
- (
- True,
- indexer_id,
- ),
- )
- else:
- with open_ext_db("diagonalley") as db:
- db.execute(
- "UPDATE diagonalley.indexers SET online = ? WHERE id = ?",
- (
- False,
- indexer_id,
- ),
- )
- except:
- print("An exception occurred")
- with open_ext_db("diagonalley") as db:
- row = db.fetchone(
- "SELECT * FROM diagonalley.indexers WHERE id = ?", (indexer_id,)
- )
- return Indexers(**row) if row else None
-
-
-def get_diagonalleys_indexers(wallet_ids: Union[str, List[str]]) -> List[Indexers]:
- if isinstance(wallet_ids, str):
- wallet_ids = [wallet_ids]
-
- with open_ext_db("diagonalley") as db:
- q = ",".join(["?"] * len(wallet_ids))
- rows = db.fetchall(
- f"SELECT * FROM diagonalley.indexers WHERE wallet IN ({q})", (*wallet_ids,)
- )
-
- for r in rows:
- try:
- x = httpx.get(r["indexeraddress"] + "/" + r["ratingkey"])
- if x.status_code == 200:
- with open_ext_db("diagonalley") as db:
- db.execute(
- "UPDATE diagonalley.indexers SET online = ? WHERE id = ?",
- (
- True,
- r["id"],
- ),
- )
- else:
- with open_ext_db("diagonalley") as db:
- db.execute(
- "UPDATE diagonalley.indexers SET online = ? WHERE id = ?",
- (
- False,
- r["id"],
- ),
- )
- except:
- print("An exception occurred")
- with open_ext_db("diagonalley") as db:
- q = ",".join(["?"] * len(wallet_ids))
- rows = db.fetchall(
- f"SELECT * FROM diagonalley.indexers WHERE wallet IN ({q})", (*wallet_ids,)
- )
- return [Indexers(**row) for row in rows]
-
-
-def delete_diagonalleys_indexer(indexer_id: str) -> None:
- with open_ext_db("diagonalley") as db:
- db.execute("DELETE FROM diagonalley.indexers WHERE id = ?", (indexer_id,))
-
-
-###Orders
-
-
-def create_diagonalleys_order(
- *,
- productid: str,
- wallet: str,
- product: str,
- quantity: int,
- shippingzone: str,
- address: str,
- email: str,
- invoiceid: str,
- paid: bool,
- shipped: bool,
-) -> Indexers:
- with open_ext_db("diagonalley") as db:
- order_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
- db.execute(
- """
- INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
- """,
- (
- order_id,
- productid,
- wallet,
- product,
- quantity,
- shippingzone,
- address,
- email,
- invoiceid,
- False,
- False,
- ),
- )
-
- return get_diagonalleys_order(order_id)
-
-
-def get_diagonalleys_order(order_id: str) -> Optional[Orders]:
- with open_ext_db("diagonalley") as db:
- row = db.fetchone("SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,))
-
- return Orders(**row) if row else None
-
-
-def get_diagonalleys_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
- if isinstance(wallet_ids, str):
- wallet_ids = [wallet_ids]
-
- with open_ext_db("diagonalley") as db:
- q = ",".join(["?"] * len(wallet_ids))
- rows = db.fetchall(
- f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})", (*wallet_ids,)
- )
- for r in rows:
- PAID = (await WALLET.get_invoice_status(r["invoiceid"])).paid
- if PAID:
- with open_ext_db("diagonalley") as db:
- db.execute(
- "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
- (
- True,
- r["id"],
- ),
- )
- rows = db.fetchall(
- f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})",
- (*wallet_ids,),
- )
- return [Orders(**row) for row in rows]
-
-
-def delete_diagonalleys_order(order_id: str) -> None:
- with open_ext_db("diagonalley") as db:
- db.execute("DELETE FROM diagonalley.orders WHERE id = ?", (order_id,))
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
deleted file mode 100644
index 9f2b787f..00000000
--- a/lnbits/extensions/diagonalley/migrations.py
+++ /dev/null
@@ -1,60 +0,0 @@
-async def m001_initial(db):
- """
- Initial products table.
- """
- await db.execute(
- """
- CREATE TABLE diagonalley.products (
- id TEXT PRIMARY KEY,
- wallet 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 indexers table.
- """
- await db.execute(
- """
- CREATE TABLE diagonalley.indexers (
- id TEXT PRIMARY KEY,
- wallet TEXT NOT NULL,
- shopname TEXT NOT NULL,
- indexeraddress TEXT NOT NULL,
- online BOOLEAN NOT NULL,
- rating INTEGER NOT NULL,
- shippingzone1 TEXT NOT NULL,
- shippingzone2 TEXT NOT NULL,
- zone1cost INTEGER NOT NULL,
- zone2cost INTEGER NOT NULL,
- email 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
deleted file mode 100644
index ab1c592d..00000000
--- a/lnbits/extensions/diagonalley/models.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from typing import NamedTuple
-from sqlite3 import Row
-from pydantic import BaseModel
-
-class Indexers(BaseModel):
- id: str
- wallet: str
- shopname: str
- indexeraddress: str
- online: bool
- rating: str
- shippingzone1: str
- shippingzone2: str
- zone1cost: int
- zone2cost: int
- email: str
-
-
-class Products(BaseModel):
- id: str
- wallet: str
- product: str
- categories: str
- description: str
- image: str
- price: int
- quantity: int
-
-
-class Orders(BaseModel):
- id: str
- productid: str
- wallet: str
- product: str
- quantity: int
- shippingzone: int
- address: str
- email: str
- invoiceid: str
- paid: bool
- shipped: bool
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html b/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
deleted file mode 100644
index 585e8d7c..00000000
--- a/lnbits/extensions/diagonalley/templates/diagonalley/_api_docs.html
+++ /dev/null
@@ -1,122 +0,0 @@
-- Diagon Alley: Decentralised Market-Stalls -
-
- Make a list of products to sell, point your list of products at a public
- indexer. Buyers browse your products on the indexer, and pay you
- directly. Ratings are managed by the indexer. Your stall can be listed
- in multiple indexers, even over TOR, if you wish to be anonymous.
- More information on the
- Diagon Alley Protocol
-
- Created by, Ben Arc
-
GET
- /api/v1/diagonalley/stall/products/<indexer_id>
- Body (application/json)
-- Returns 201 CREATED (application/json) -
-Product JSON list
- Curl example
-curl -X GET {{ request.url_root
- }}diagonalley/api/v1/diagonalley/stall/products/<indexer_id>
- POST
- /api/v1/diagonalley/stall/order/<indexer_id>
- Body (application/json)
-{"id": <string>, "address": <string>, "shippingzone":
- <integer>, "email": <string>, "quantity":
- <integer>}
- - Returns 201 CREATED (application/json) -
-{"checking_id": <string>,"payment_request":
- <string>}
- Curl example
-curl -X POST {{ request.url_root
- }}diagonalley/api/v1/diagonalley/stall/order/<indexer_id> -d
- '{"id": <product_id&>, "email": <customer_email>,
- "address": <customer_address>, "quantity": 2, "shippingzone":
- 1}' -H "Content-type: application/json"
-
- GET
- /diagonalley/api/v1/diagonalley/stall/checkshipped/<checking_id>
- Headers
-- Returns 200 OK (application/json) -
-{"shipped": <boolean>}
- Curl example
-curl -X GET {{ request.url_root
- }}diagonalley/api/v1/diagonalley/stall/checkshipped/<checking_id>
- -H "Content-type: application/json"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html b/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
deleted file mode 100644
index a45d254d..00000000
--- a/lnbits/extensions/diagonalley/templates/diagonalley/stall.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py
deleted file mode 100644
index df264a66..00000000
--- a/lnbits/extensions/diagonalley/views.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from quart import g, render_template
-
-from lnbits.decorators import check_user_exists, validate_uuids
-from lnbits.extensions.diagonalley import diagonalley_ext
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@diagonalley_ext.route("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("diagonalley/index.html", {"request": request, "user": g.user})
\ No newline at end of file
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
deleted file mode 100644
index 4656fcce..00000000
--- a/lnbits/extensions/diagonalley/views_api.py
+++ /dev/null
@@ -1,350 +0,0 @@
-from quart import g, jsonify, request
-from http import HTTPStatus
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-
-from lnbits.extensions.diagonalley import diagonalley_ext
-from .crud import (
- create_diagonalleys_product,
- get_diagonalleys_product,
- get_diagonalleys_products,
- delete_diagonalleys_product,
- create_diagonalleys_indexer,
- update_diagonalleys_indexer,
- get_diagonalleys_indexer,
- get_diagonalleys_indexers,
- delete_diagonalleys_indexer,
- create_diagonalleys_order,
- get_diagonalleys_order,
- get_diagonalleys_orders,
- update_diagonalleys_product,
-)
-from lnbits.core.services import create_invoice
-from base64 import urlsafe_b64encode
-from uuid import uuid4
-from lnbits.db import open_ext_db
-
-### Products
-
-
-@diagonalley_ext.get("/api/v1/diagonalley/products")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalley_products():
- wallet_ids = [g.wallet.id]
-
- if "all_wallets" in request.args:
- wallet_ids = get_user(g.wallet.user).wallet_ids
-
- return (
- jsonify(
- [product._asdict() for product in get_diagonalleys_products(wallet_ids)]
- ),
- HTTPStatus.OK,
- )
-
-class CreateData(BaseModel):
- product: str
- categories: str
- description: str
- image: str
- price: int = Query(ge=0)
- quantity: int = Query(ge=0)
-
-@diagonalley_ext.post("/api/v1/diagonalley/products")
-@diagonalley_ext.put("/api/v1/diagonalley/products{product_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalley_product_create(product_id=None):
-
- if product_id:
- product = get_diagonalleys_indexer(product_id)
-
- if not product:
- return (
- jsonify({"message": "Withdraw product does not exist."}),
- HTTPStatus.NOT_FOUND,
- )
-
- if product.wallet != g.wallet.id:
- return (
- jsonify({"message": "Not your withdraw product."}),
- HTTPStatus.FORBIDDEN,
- )
-
- product = update_diagonalleys_product(product_id, **g.data)
- else:
- product = create_diagonalleys_product(wallet_id=g.wallet.id, **g.data)
-
- return (
- jsonify(product._asdict()),
- HTTPStatus.OK if product_id else HTTPStatus.CREATED,
- )
-
-
-@diagonalley_ext.delete("/api/v1/diagonalley/products/{product_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalley_products_delete(product_id):
- product = get_diagonalleys_product(product_id)
-
- if not product:
- return jsonify({"message": "Product does not exist."}), HTTPStatus.NOT_FOUND
-
- if product.wallet != g.wallet.id:
- return jsonify({"message": "Not your Diagon Alley."}), HTTPStatus.FORBIDDEN
-
- delete_diagonalleys_product(product_id)
-
- return "", HTTPStatus.NO_CONTENT
-
-
-###Indexers
-
-
-@diagonalley_ext.get("/api/v1/diagonalley/indexers")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalley_indexers():
- wallet_ids = [g.wallet.id]
-
- if "all_wallets" in request.args:
- wallet_ids = get_user(g.wallet.user).wallet_ids
-
- return (
- jsonify(
- [indexer._asdict() for indexer in get_diagonalleys_indexers(wallet_ids)]
- ),
- HTTPStatus.OK,
- )
-
-class CreateData(BaseModel):
- shopname: str
- indexeraddress: str
- shippingzone1: str
- shippingzone2: str
- email: str
- zone1cost: int = Query(ge=0)
- zone2cost: int = Query(ge=0)
-
-@diagonalley_ext.post("/api/v1/diagonalley/indexers")
-@diagonalley_ext.put("/api/v1/diagonalley/indexers{indexer_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalley_indexer_create(data: CreateData, indexer_id=None):
-
- if indexer_id:
- indexer = get_diagonalleys_indexer(indexer_id)
-
- if not indexer:
- return (
- jsonify({"message": "Withdraw indexer does not exist."}),
- HTTPStatus.NOT_FOUND,
- )
-
- if indexer.wallet != g.wallet.id:
- return (
- jsonify({"message": "Not your withdraw indexer."}),
- HTTPStatus.FORBIDDEN,
- )
-
- indexer = update_diagonalleys_indexer(indexer_id, **data)
- else:
- indexer = create_diagonalleys_indexer(wallet_id=g.wallet.id, **data)
-
- return (
- indexer._asdict(),
- HTTPStatus.OK if indexer_id else HTTPStatus.CREATED,
- )
-
-
-@diagonalley_ext.delete("/api/v1/diagonalley/indexers/{indexer_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalley_indexer_delete(indexer_id):
- indexer = get_diagonalleys_indexer(indexer_id)
-
- if not indexer:
- return {"message": "Indexer does not exist."}, HTTPStatus.NOT_FOUND
-
- if indexer.wallet != g.wallet.id:
- return {"message": "Not your Indexer."}, HTTPStatus.FORBIDDEN
-
- delete_diagonalleys_indexer(indexer_id)
-
- return "", HTTPStatus.NO_CONTENT
-
-
-###Orders
-
-
-@diagonalley_ext.get("/api/v1/diagonalley/orders")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalley_orders():
- wallet_ids = [g.wallet.id]
-
- if "all_wallets" in request.args:
- wallet_ids = get_user(g.wallet.user).wallet_ids
-
- return (
- [order._asdict() for order in get_diagonalleys_orders(wallet_ids)],
- HTTPStatus.OK,
- )
-
-class CreateData(BaseModel):
- id: str
- address: str
- email: str
- quantity: int
- shippingzone: int
-
-@diagonalley_ext.post("/api/v1/diagonalley/orders")
-@api_check_wallet_key(key_type="invoice")
-
-async def api_diagonalley_order_create(data: CreateData):
- order = create_diagonalleys_order(wallet_id=g.wallet.id, **data)
- return order._asdict(), HTTPStatus.CREATED
-
-
-@diagonalley_ext.delete("/api/v1/diagonalley/orders/{order_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalley_order_delete(order_id):
- order = get_diagonalleys_order(order_id)
-
- if not order:
- return {"message": "Indexer does not exist."}, HTTPStatus.NOT_FOUND
-
- if order.wallet != g.wallet.id:
- return {"message": "Not your Indexer."}, HTTPStatus.FORBIDDEN
-
- delete_diagonalleys_indexer(order_id)
-
- return "", HTTPStatus.NO_CONTENT
-
-
-@diagonalley_ext.get("/api/v1/diagonalley/orders/paid/{order_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalleys_order_paid(order_id):
- with open_ext_db("diagonalley") as db:
- db.execute(
- "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
- (
- True,
- order_id,
- ),
- )
- return "", HTTPStatus.OK
-
-
-@diagonalley_ext.get("/api/v1/diagonalley/orders/shipped/{order_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_diagonalleys_order_shipped(order_id):
- with open_ext_db("diagonalley") as db:
- db.execute(
- "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
- (
- True,
- order_id,
- ),
- )
- order = db.fetchone(
- "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
- )
-
- return (
- jsonify(
- [order._asdict() for order in get_diagonalleys_orders(order["wallet"])]
- ),
- HTTPStatus.OK,
- )
-
-
-###List products based on indexer id
-
-
-@diagonalley_ext.get(
- "/api/v1/diagonalley/stall/products/{indexer_id}"
-)
-async def api_diagonalleys_stall_products(indexer_id):
- with open_ext_db("diagonalley") as db:
- rows = db.fetchone(
- "SELECT * FROM diagonalley.indexers WHERE id = ?", (indexer_id,)
- )
- print(rows[1])
- if not rows:
- return {"message": "Indexer does not exist."}, HTTPStatus.NOT_FOUND
-
- products = db.fetchone(
- "SELECT * FROM diagonalley.products WHERE wallet = ?", (rows[1],)
- )
- if not products:
- return {"message": "No products"}, HTTPStatus.NOT_FOUND
-
- return (
- [products._asdict() for products in get_diagonalleys_products(rows[1])],
- HTTPStatus.OK,
- )
-
-
-###Check a product has been shipped
-
-
-@diagonalley_ext.get(
- "/api/v1/diagonalley/stall/checkshipped/{checking_id}"
-)
-async def api_diagonalleys_stall_checkshipped(checking_id):
- with open_ext_db("diagonalley") as db:
- rows = db.fetchone(
- "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
- )
-
- return {"shipped": rows["shipped"]}, HTTPStatus.OK
-
-
-###Place order
-
-
-@diagonalley_ext.post("/api/v1/diagonalley/stall/order/{indexer_id}")
-@api_validate_post_request(
- schema={
- "id": {"type": "string", "empty": False, "required": True},
- "email": {"type": "string", "empty": False, "required": True},
- "address": {"type": "string", "empty": False, "required": True},
- "quantity": {"type": "integer", "empty": False, "required": True},
- "shippingzone": {"type": "integer", "empty": False, "required": True},
- }
-)
-async def api_diagonalley_stall_order(indexer_id):
- product = get_diagonalleys_product(g.data["id"])
- shipping = get_diagonalleys_indexer(indexer_id)
-
- if g.data["shippingzone"] == 1:
- shippingcost = shipping.zone1cost
- else:
- shippingcost = shipping.zone2cost
-
- checking_id, payment_request = create_invoice(
- wallet_id=product.wallet,
- amount=shippingcost + (g.data["quantity"] * product.price),
- memo=g.data["id"],
- )
- selling_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
- with open_ext_db("diagonalley") as db:
- db.execute(
- """
- INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
- """,
- (
- selling_id,
- g.data["id"],
- product.wallet,
- product.product,
- g.data["quantity"],
- g.data["shippingzone"],
- g.data["address"],
- g.data["email"],
- checking_id,
- False,
- False,
- ),
- )
- return (
- {"checking_id": checking_id, "payment_request": payment_request},
- HTTPStatus.OK,
- )
diff --git a/lnbits/extensions/events/README.md b/lnbits/extensions/events/README.md
deleted file mode 100644
index 11b62fec..00000000
--- a/lnbits/extensions/events/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Events
-
-## Sell tickets for events and use the built-in scanner for registering attendants
-
-Events alows you to make tickets for an event. Each ticket is in the form of a uniqque QR code. After registering, and paying for ticket, the user gets a QR code to present at registration/entrance.
-
-Events includes a shareable ticket scanner, which can be used to register attendees.
-
-## Usage
-
-1. Create an event\
- 
-2. Fill out the event information:
-
- - event name
- - wallet (normally there's only one)
- - event information
- - closing date for event registration
- - begin and end date of the event
-
- 
-
-3. Share the event registration link\
- 
-
- - ticket example\
- 
-
- - QR code ticket, presented after invoice paid, to present at registration\
- 
-
-4. Use the built-in ticket scanner to validate registered, and paid, attendees\
- 
diff --git a/lnbits/extensions/events/__init__.py b/lnbits/extensions/events/__init__.py
deleted file mode 100644
index b8f4deb5..00000000
--- a/lnbits/extensions/events/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from quart import Blueprint
-from lnbits.db import Database
-
-db = Database("ext_events")
-
-
-events_ext: Blueprint = Blueprint(
- "events", __name__, static_folder="static", template_folder="templates"
-)
-
-
-from .views_api import * # noqa
-from .views import * # noqa
diff --git a/lnbits/extensions/events/config.json b/lnbits/extensions/events/config.json
deleted file mode 100644
index 6bc144ab..00000000
--- a/lnbits/extensions/events/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "Events",
- "short_description": "Sell and register event tickets",
- "icon": "local_activity",
- "contributors": ["benarc"]
-}
diff --git a/lnbits/extensions/events/crud.py b/lnbits/extensions/events/crud.py
deleted file mode 100644
index dece8e6d..00000000
--- a/lnbits/extensions/events/crud.py
+++ /dev/null
@@ -1,168 +0,0 @@
-from typing import List, Optional, Union
-
-from lnbits.helpers import urlsafe_short_hash
-
-from . import db
-from .models import Tickets, Events
-
-
-# TICKETS
-
-
-async def create_ticket(
- payment_hash: str, wallet: str, event: str, name: str, email: str
-) -> Tickets:
- await db.execute(
- """
- INSERT INTO events.ticket (id, wallet, event, name, email, registered, paid)
- VALUES (?, ?, ?, ?, ?, ?, ?)
- """,
- (payment_hash, wallet, event, name, email, False, False),
- )
-
- ticket = await get_ticket(payment_hash)
- assert ticket, "Newly created ticket couldn't be retrieved"
- return ticket
-
-
-async def set_ticket_paid(payment_hash: str) -> Tickets:
- row = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (payment_hash,))
- if row[6] != True:
- await db.execute(
- """
- UPDATE events.ticket
- SET paid = true
- WHERE id = ?
- """,
- (payment_hash,),
- )
-
- eventdata = await get_event(row[2])
- assert eventdata, "Couldn't get event from ticket being paid"
-
- sold = eventdata.sold + 1
- amount_tickets = eventdata.amount_tickets - 1
- await db.execute(
- """
- UPDATE events.events
- SET sold = ?, amount_tickets = ?
- WHERE id = ?
- """,
- (sold, amount_tickets, row[2]),
- )
-
- ticket = await get_ticket(payment_hash)
- assert ticket, "Newly updated ticket couldn't be retrieved"
- return ticket
-
-
-async def get_ticket(payment_hash: str) -> Optional[Tickets]:
- row = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (payment_hash,))
- return Tickets(**row) if row else None
-
-
-async def get_tickets(wallet_ids: Union[str, List[str]]) -> List[Tickets]:
- if isinstance(wallet_ids, str):
- wallet_ids = [wallet_ids]
-
- q = ",".join(["?"] * len(wallet_ids))
- rows = await db.fetchall(
- f"SELECT * FROM events.ticket WHERE wallet IN ({q})", (*wallet_ids,)
- )
- return [Tickets(**row) for row in rows]
-
-
-async def delete_ticket(payment_hash: str) -> None:
- await db.execute("DELETE FROM events.ticket WHERE id = ?", (payment_hash,))
-
-
-# EVENTS
-
-
-async def create_event(
- *,
- wallet: str,
- name: str,
- info: str,
- closing_date: str,
- event_start_date: str,
- event_end_date: str,
- amount_tickets: int,
- price_per_ticket: int,
-) -> Events:
- event_id = urlsafe_short_hash()
- await db.execute(
- """
- INSERT INTO events.events (id, wallet, name, info, closing_date, event_start_date, event_end_date, amount_tickets, price_per_ticket, sold)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
- """,
- (
- event_id,
- wallet,
- name,
- info,
- closing_date,
- event_start_date,
- event_end_date,
- amount_tickets,
- price_per_ticket,
- 0,
- ),
- )
-
- event = await get_event(event_id)
- assert event, "Newly created event couldn't be retrieved"
- return event
-
-
-async def update_event(event_id: str, **kwargs) -> Events:
- q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
- await db.execute(
- f"UPDATE events.events SET {q} WHERE id = ?", (*kwargs.values(), event_id)
- )
- event = await get_event(event_id)
- assert event, "Newly updated event couldn't be retrieved"
- return event
-
-
-async def get_event(event_id: str) -> Optional[Events]:
- row = await db.fetchone("SELECT * FROM events.events WHERE id = ?", (event_id,))
- return Events(**row) if row else None
-
-
-async def get_events(wallet_ids: Union[str, List[str]]) -> List[Events]:
- if isinstance(wallet_ids, str):
- wallet_ids = [wallet_ids]
-
- q = ",".join(["?"] * len(wallet_ids))
- rows = await db.fetchall(
- f"SELECT * FROM events.events WHERE wallet IN ({q})", (*wallet_ids,)
- )
-
- return [Events(**row) for row in rows]
-
-
-async def delete_event(event_id: str) -> None:
- await db.execute("DELETE FROM events.events WHERE id = ?", (event_id,))
-
-
-# EVENTTICKETS
-
-
-async def get_event_tickets(event_id: str, wallet_id: str) -> List[Tickets]:
- rows = await db.fetchall(
- "SELECT * FROM events.ticket WHERE wallet = ? AND event = ?",
- (wallet_id, event_id),
- )
- return [Tickets(**row) for row in rows]
-
-
-async def reg_ticket(ticket_id: str) -> List[Tickets]:
- await db.execute(
- "UPDATE events.ticket SET registered = ? WHERE id = ?", (True, ticket_id)
- )
- ticket = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (ticket_id,))
- rows = await db.fetchall(
- "SELECT * FROM events.ticket WHERE event = ?", (ticket[1],)
- )
- return [Tickets(**row) for row in rows]
diff --git a/lnbits/extensions/events/migrations.py b/lnbits/extensions/events/migrations.py
deleted file mode 100644
index d8f3d94e..00000000
--- a/lnbits/extensions/events/migrations.py
+++ /dev/null
@@ -1,91 +0,0 @@
-async def m001_initial(db):
-
- await db.execute(
- """
- CREATE TABLE events.events (
- id TEXT PRIMARY KEY,
- wallet TEXT NOT NULL,
- name TEXT NOT NULL,
- info TEXT NOT NULL,
- closing_date TEXT NOT NULL,
- event_start_date TEXT NOT NULL,
- event_end_date TEXT NOT NULL,
- amount_tickets INTEGER NOT NULL,
- price_per_ticket INTEGER NOT NULL,
- sold INTEGER NOT NULL,
- time TIMESTAMP NOT NULL DEFAULT """
- + db.timestamp_now
- + """
- );
- """
- )
-
- await db.execute(
- """
- CREATE TABLE events.tickets (
- id TEXT PRIMARY KEY,
- wallet TEXT NOT NULL,
- event TEXT NOT NULL,
- name TEXT NOT NULL,
- email TEXT NOT NULL,
- registered BOOLEAN NOT NULL,
- time TIMESTAMP NOT NULL DEFAULT """
- + db.timestamp_now
- + """
- );
- """
- )
-
-
-async def m002_changed(db):
-
- await db.execute(
- """
- CREATE TABLE events.ticket (
- id TEXT PRIMARY KEY,
- wallet TEXT NOT NULL,
- event TEXT NOT NULL,
- name TEXT NOT NULL,
- email TEXT NOT NULL,
- registered BOOLEAN NOT NULL,
- paid BOOLEAN NOT NULL,
- time TIMESTAMP NOT NULL DEFAULT """
- + db.timestamp_now
- + """
- );
- """
- )
-
- for row in [list(row) for row in await db.fetchall("SELECT * FROM events.tickets")]:
- usescsv = ""
-
- for i in range(row[5]):
- if row[7]:
- usescsv += "," + str(i + 1)
- else:
- usescsv += "," + str(1)
- usescsv = usescsv[1:]
- await db.execute(
- """
- INSERT INTO events.ticket (
- id,
- wallet,
- event,
- name,
- email,
- registered,
- paid
- )
- VALUES (?, ?, ?, ?, ?, ?, ?)
- """,
- (
- row[0],
- row[1],
- row[2],
- row[3],
- row[4],
- row[5],
- True,
- ),
- )
- await db.execute("DROP TABLE events.tickets")
diff --git a/lnbits/extensions/events/models.py b/lnbits/extensions/events/models.py
deleted file mode 100644
index 59b8071d..00000000
--- a/lnbits/extensions/events/models.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from sqlite3 import Row
-from pydantic import BaseModel
-#from typing import NamedTuple
-
-
-class Events(BaseModel):
- id: str
- wallet: str
- name: str
- info: str
- closing_date: str
- event_start_date: str
- event_end_date: str
- amount_tickets: int
- price_per_ticket: int
- sold: int
- time: int
-
-
-class Tickets(BaseModel):
- id: str
- wallet: str
- event: str
- name: str
- email: str
- registered: bool
- paid: bool
- time: int
\ No newline at end of file
diff --git a/lnbits/extensions/events/templates/events/_api_docs.html b/lnbits/extensions/events/templates/events/_api_docs.html
deleted file mode 100644
index a5c82174..00000000
--- a/lnbits/extensions/events/templates/events/_api_docs.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- New Product
- New Indexer
-
- Frontend shop your stall will list its products in
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
- Link to pass to stall indexer
-
-
- {{ col.value }}
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
- Product shipped?
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
- Products
-
- Export to CSV
-
-
-
-
-
- Indexers
-
- Export to CSV
-
-
-
-
-
- Orders
-
- Export to CSV
-
-
-
-
-
-
- {% include "diagonalley/_api_docs.html" %}
-
-
-
-
- LNbits Diagon Alley Extension
-
- Update Product
-
- Create Product
-
- Cancel
-
-
- Update Indexer
-
- Create Indexer
-
- Cancel
-
- - Events: Sell and register ticket waves for an event -
-
- Events alows you to make a wave of tickets for an event, each ticket is
- in the form of a unqiue QRcode, which the user presents at registration.
- Events comes with a shareable ticket scanner, which can be used to
- register attendees.
-
- Created by, Ben Arc
-
-
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %}
-
-{% endblock %}
diff --git a/lnbits/extensions/events/templates/events/error.html b/lnbits/extensions/events/templates/events/error.html
deleted file mode 100644
index f231177b..00000000
--- a/lnbits/extensions/events/templates/events/error.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "public.html" %} {% block page %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ event_name }}
--
{{ event_info }}
--
- Submit
- Cancel
-
-
- Link to your ticket!
-
-
- -
You'll be redirected in a few moments...
-
-
-
-
-
-
-
- Copy invoice
- Close
-
-
-
diff --git a/lnbits/extensions/events/templates/events/index.html b/lnbits/extensions/events/templates/events/index.html
deleted file mode 100644
index 1ad3d885..00000000
--- a/lnbits/extensions/events/templates/events/index.html
+++ /dev/null
@@ -1,538 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-
-
-
-
-
-
-
-
-
-
-
- {% endblock %} {% block scripts %}
-
-
-
- {% endblock %}
-{{ event_name }} error
--
{{ event_error }}
--
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/events/templates/events/register.html b/lnbits/extensions/events/templates/events/register.html
deleted file mode 100644
index 4dff9afb..00000000
--- a/lnbits/extensions/events/templates/events/register.html
+++ /dev/null
@@ -1,173 +0,0 @@
-{% extends "public.html" %} {% block page %}
-
-
-
-
- New Event
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
- Events
-
- Export to CSV
-
-
-
-
-
- Tickets
-
- Export to CSV
-
-
-
-
-
-
- {% include "events/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} Events extension -
-
-
-
-
-
-
-
-
-
-
-
-
- Ticket closing date
-
-
-
-
-
- Event begins
-
-
-
-
-
- Event ends
-
-
-
-
-
-
-
-
-
-
- Update Event
- Create Event
- Cancel
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %}
-
-{% endblock %}
diff --git a/lnbits/extensions/events/templates/events/ticket.html b/lnbits/extensions/events/templates/events/ticket.html
deleted file mode 100644
index a53f834f..00000000
--- a/lnbits/extensions/events/templates/events/ticket.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends "public.html" %} {% block page %}
-
-
-
-
-
- -
- -Scan ticket
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
-
-
- {{ col.value }}
-
-
-
- {% endraw %}
-
-
-
-
-
- {{ event_name }} Registration
-- -
- -
-
-
- Cancel
-
-
-
-{% endblock %} {% block scripts %}
-
-{% endblock %}
diff --git a/lnbits/extensions/events/views.py b/lnbits/extensions/events/views.py
deleted file mode 100644
index f3d8cc29..00000000
--- a/lnbits/extensions/events/views.py
+++ /dev/null
@@ -1,83 +0,0 @@
-from quart import g, abort, render_template
-from datetime import date, datetime
-from http import HTTPStatus
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import events_ext
-from .crud import get_ticket, get_event
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@events_ext.route("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return templates.TemplateResponse("events/index.html", {"user":g.user})
-
-@events_ext.route("/
-
-
-
-
-
- Bookmark, print or screenshot this page,
-
- -
-
-
-
-
-
-
-{{ ticket_name }} Ticket
--
- Bookmark, print or screenshot this page,
- and present it for registration!
-
- - -
-
Example Extension
-*tagline*
-This is an example extension to help you organise and build you own. - -Try to include an image -
-
-
-If your extension has API endpoints, include useful ones here
- -curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "X-Api-Key: YOUR_WALLET-ADMIN/INVOICE-KEY"
diff --git a/lnbits/extensions/example/__init__.py b/lnbits/extensions/example/__init__.py
deleted file mode 100644
index e16e0372..00000000
--- a/lnbits/extensions/example/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from quart import Blueprint
-from lnbits.db import Database
-
-db = Database("ext_example")
-
-example_ext: Blueprint = Blueprint(
- "example", __name__, static_folder="static", template_folder="templates"
-)
-
-
-from .views_api import * # noqa
-from .views import * # noqa
diff --git a/lnbits/extensions/example/config.json b/lnbits/extensions/example/config.json
deleted file mode 100644
index 55389373..00000000
--- a/lnbits/extensions/example/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "Build your own!",
- "short_description": "Join us, make an extension",
- "icon": "info",
- "contributors": ["github_username"]
-}
diff --git a/lnbits/extensions/example/migrations.py b/lnbits/extensions/example/migrations.py
deleted file mode 100644
index 99d7c362..00000000
--- a/lnbits/extensions/example/migrations.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# async def m001_initial(db):
-# await db.execute(
-# f"""
-# CREATE TABLE example.example (
-# id TEXT PRIMARY KEY,
-# wallet TEXT NOT NULL,
-# time TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
-# );
-# """
-# )
diff --git a/lnbits/extensions/example/models.py b/lnbits/extensions/example/models.py
deleted file mode 100644
index be523233..00000000
--- a/lnbits/extensions/example/models.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# from sqlite3 import Row
-# from typing import NamedTuple
-
-
-# class Example(NamedTuple):
-# id: str
-# wallet: str
-#
-# @classmethod
-# def from_row(cls, row: Row) -> "Example":
-# return cls(**dict(row))
diff --git a/lnbits/extensions/example/templates/example/index.html b/lnbits/extensions/example/templates/example/index.html
deleted file mode 100644
index d732ef37..00000000
--- a/lnbits/extensions/example/templates/example/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-- Frameworks used by {{SITE_TITLE}} -
-- A magical "g" is always available, with info about the user, wallets and - extensions: -
-{% raw %}{{ g }}{% endraw %}
- Hivemind
- -Placeholder for a future Bitcoin Hivemind extension. diff --git a/lnbits/extensions/hivemind/__init__.py b/lnbits/extensions/hivemind/__init__.py deleted file mode 100644 index cc2420d8..00000000 --- a/lnbits/extensions/hivemind/__init__.py +++ /dev/null @@ -1,11 +0,0 @@ -from quart import Blueprint -from lnbits.db import Database - -db = Database("ext_hivemind") - -hivemind_ext: Blueprint = Blueprint( - "hivemind", __name__, static_folder="static", template_folder="templates" -) - - -from .views import * # noqa diff --git a/lnbits/extensions/hivemind/config.json b/lnbits/extensions/hivemind/config.json deleted file mode 100644 index a5469b15..00000000 --- a/lnbits/extensions/hivemind/config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Hivemind", - "short_description": "Make cheap talk expensive!", - "icon": "batch_prediction", - "contributors": ["fiatjaf"] -} diff --git a/lnbits/extensions/hivemind/migrations.py b/lnbits/extensions/hivemind/migrations.py deleted file mode 100644 index 775a9454..00000000 --- a/lnbits/extensions/hivemind/migrations.py +++ /dev/null @@ -1,10 +0,0 @@ -# async def m001_initial(db): -# await db.execute( -# f""" -# CREATE TABLE hivemind.hivemind ( -# id TEXT PRIMARY KEY, -# wallet TEXT NOT NULL, -# time TIMESTAMP NOT NULL DEFAULT {db.timestamp_now} -# ); -# """ -# ) diff --git a/lnbits/extensions/hivemind/models.py b/lnbits/extensions/hivemind/models.py deleted file mode 100644 index be523233..00000000 --- a/lnbits/extensions/hivemind/models.py +++ /dev/null @@ -1,11 +0,0 @@ -# from sqlite3 import Row -# from typing import NamedTuple - - -# class Example(NamedTuple): -# id: str -# wallet: str -# -# @classmethod -# def from_row(cls, row: Row) -> "Example": -# return cls(**dict(row)) diff --git a/lnbits/extensions/hivemind/templates/hivemind/index.html b/lnbits/extensions/hivemind/templates/hivemind/index.html deleted file mode 100644 index 40a320f0..00000000 --- a/lnbits/extensions/hivemind/templates/hivemind/index.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "base.html" %} {% from "macros.jinja" import window_vars with context -%} {% block page %} -- This extension is just a placeholder for now. -
-- Hivemind is a Bitcoin sidechain - project for a peer-to-peer oracle protocol that absorbs accurate data into - a blockchain so that Bitcoin users can speculate in prediction markets. -
-- These markets have the potential to revolutionize the emergence of - diffusion of knowledge in society and fix all sorts of problems in the - world. -
-- This extension will become fully operative when the - BIP300 soft-fork gets activated and - Bitcoin Hivemind is launched. -
-Select the playlists you want people to be able to pay for, share - the frontend page, profit :)
- Made by, - benarc. - Inspired by, - pirosb3. -
GET /jukebox/api/v1/jukebox
- Headers
-{"X-Api-Key": <admin_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-[<jukebox_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/jukebox -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
-
- GET
- /jukebox/api/v1/jukebox/<juke_id>
- Headers
-{"X-Api-Key": <admin_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-<jukebox_object>
- Curl example
-curl -X GET {{ request.url_root }}api/v1/jukebox/<juke_id> -H
- "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
-
- POST/PUT
- /jukebox/api/v1/jukebox/
- Headers
-{"X-Api-Key": <admin_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-<jukbox_object>
- Curl example
-curl -X POST {{ request.url_root }}api/v1/jukebox/ -d '{"user":
- <string, user_id>, "title": <string>,
- "wallet":<string>, "sp_user": <string,
- spotify_user_account>, "sp_secret": <string,
- spotify_user_secret>, "sp_access_token": <string,
- not_required>, "sp_refresh_token": <string, not_required>,
- "sp_device": <string, spotify_user_secret>, "sp_playlists":
- <string, not_required>, "price": <integer, not_required>}'
- -H "Content-type: application/json" -H "X-Api-Key:
- {{g.user.wallets[0].adminkey }}"
-
- DELETE
- /jukebox/api/v1/jukebox/<juke_id>
- Headers
-{"X-Api-Key": <admin_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-<jukebox_object>
- Curl example
-curl -X DELETE {{ request.url_root }}api/v1/jukebox/<juke_id>
- -H "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
-
-
-
diff --git a/lnbits/extensions/jukebox/templates/jukebox/index.html b/lnbits/extensions/jukebox/templates/jukebox/index.html
deleted file mode 100644
index 9b4efbd5..00000000
--- a/lnbits/extensions/jukebox/templates/jukebox/index.html
+++ /dev/null
@@ -1,368 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-
-
-
-
-
-
-
-
-
-
-
- {% endblock %} {% block scripts %}
-
-
-
- {% endblock %}
-Jukebox error
--
- Ask the host to turn on the device and launch spotify -
--
-
-
-
-
-
-
-
-
-
-
- 
- To use this extension you need a Spotify client ID and client secret.
- You get these by creating an app in the Spotify developers dashboard
- here.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
- In the app go to edit-settings, set the redirect URI to this link
-
-{% raw %}{{ locationcb }}{{ jukeboxDialog.data.sp_id }}{% endraw
- %} Click to copy URL
-
-
- Settings can be found - here. - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-
-{% endblock %}
diff --git a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
deleted file mode 100644
index cb3ab49d..00000000
--- a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
+++ /dev/null
@@ -1,277 +0,0 @@
-{% extends "public.html" %} {% block page %} {% raw %}
-
-
-
- Add Spotify Jukebox
-
- {% raw %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Jukebox QR
-
-
-
-
- Delete Jukebox
-
-
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
- {{ col.label }}
- {{ col.value }}
-
-
-
-
-
- {% include "jukebox/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} jukebox extension -
-
-
-
-
- Continue
- Continue
-
-
- Cancel
-
- -
- To use this extension you need a Spotify client ID and client secret.
- You get these by creating an app in the Spotify developers dashboard
- here.
-
-
-
-
- Submit keys
- Submit keys
-
-
- Cancel
-
- -
- In the app go to edit-settings, set the redirect URI to this link
- -
- Settings can be found - here. - -
-
-
-
- Authorise access
- Authorise access
-
-
- Cancel
-
- -
-
-
- Create Jukebox
- Create Jukebox
-
-
- Cancel
-
- Shareable Jukebox QR
-
-
- Copy jukebox link
- Open jukebox
- Close
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{% endraw %} {% endblock %} {% block scripts %}
-
-
-
-{% endblock %}
diff --git a/lnbits/extensions/jukebox/views.py b/lnbits/extensions/jukebox/views.py
deleted file mode 100644
index c38b24b3..00000000
--- a/lnbits/extensions/jukebox/views.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import time
-from datetime import datetime
-from quart import g, render_template, request, jsonify, websocket
-from http import HTTPStatus
-import trio
-from lnbits.decorators import check_user_exists, validate_uuids
-from lnbits.core.models import Payment
-
-import json
-from . import jukebox_ext
-from .crud import get_jukebox
-from .views_api import api_get_jukebox_device_check
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@jukebox_ext.get("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("jukebox/index.html", {"request": request,"user":g.user})
-
-
-@jukebox_ext.get("/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }} - ({{ item.artist }})
-
-
-
-
-
-
-
-
-
- Currently playing
-
-
-
- ![]()
-
-
- {{ currentPlay.name }}
- {{ currentPlay.artist }} -
- - {{ currentPlay.artist }} -
Pick a song
-
-
-
- ![]()
-
-
- {{ receive.name }}
- {{ receive.artist }} -
- - {{ receive.artist }} -
-
- Play for {% endraw %}{{ price }}{% raw %} sats
-
-
-
- Copy invoice
-
- Success!
You can close this window
" - - -@jukebox_ext.get("/api/v1/jukebox/{juke_id}") -@api_check_wallet_key("admin") -async def api_check_credentials_check(juke_id): - jukebox = await get_jukebox(juke_id) - return jsonify(jukebox._asdict()), HTTPStatus.CREATED - - -class CreateData(BaseModel): - user: str = None - title: str = None - wallet: str = None - sp_user: str = None - sp_secret: str = None - sp_access_token: Optional[str] = None - sp_refresh_token: Optional[str] = None - sp_device: Optional[str] = None - sp_playlists: Optional[str] = None - price: Optional[str] = None - -@jukebox_ext.post("/api/v1/jukebox/") -@jukebox_ext.put("/api/v1/jukebox/{juke_id}") -@api_check_wallet_key("admin") -async def api_create_update_jukebox(data: CreateData, juke_id=None): - if juke_id: - jukebox = await update_jukebox(juke_id=juke_id, inkey=g.wallet.inkey, **data) - else: - jukebox = await create_jukebox(inkey=g.wallet.inkey, **data) - - return jukebox._asdict(), HTTPStatus.CREATED - - -@jukebox_ext.delete("/api/v1/jukebox/{juke_id}") -@api_check_wallet_key("admin") -async def api_delete_item(juke_id): - await delete_jukebox(juke_id) - try: - return ( - [{**jukebox._asdict()} for jukebox in await get_jukeboxs(g.wallet.user)] - , - HTTPStatus.OK, - ) - except: - return "", HTTPStatus.NO_CONTENT - - -################JUKEBOX ENDPOINTS################## - -######GET ACCESS TOKEN###### - - -@jukebox_ext.get( - "/api/v1/jukebox/jb/playlist/{juke_id}/{sp_playlist}" -) -async def api_get_jukebox_song(juke_id, sp_playlist, retry=False): - try: - jukebox = await get_jukebox(juke_id) - except: - return ( - jsonable_encoder({"error": "No Jukebox"}), - HTTPStatus.FORBIDDEN, - ) - tracks = [] - async with httpx.AsyncClient() as client: - try: - r = await client.get( - "https://api.spotify.com/v1/playlists/" + sp_playlist + "/tracks", - timeout=40, - headers={"Authorization": "Bearer " + jukebox.sp_access_token}, - ) - if "items" not in r.json(): - if r.status_code == 401: - token = await api_get_token(juke_id) - if token == False: - return False - elif retry: - return ( - jsonable_encoder({"error": "Failed to get auth"}), - HTTPStatus.FORBIDDEN, - ) - else: - return await api_get_jukebox_song( - juke_id, sp_playlist, retry=True - ) - return r, HTTPStatus.OK - for item in r.json()["items"]: - tracks.append( - { - "id": item["track"]["id"], - "name": item["track"]["name"], - "album": item["track"]["album"]["name"], - "artist": item["track"]["artists"][0]["name"], - "image": item["track"]["album"]["images"][0]["url"], - } - ) - except AssertionError: - something = None - return [track for track in tracks] - - -async def api_get_token(juke_id): - try: - jukebox = await get_jukebox(juke_id) - except: - return ( - jsonable_encoder({"error": "No Jukebox"}), - HTTPStatus.FORBIDDEN, - ) - - async with httpx.AsyncClient() as client: - try: - r = await client.post( - "https://accounts.spotify.com/api/token", - timeout=40, - params={ - "grant_type": "refresh_token", - "refresh_token": jukebox.sp_refresh_token, - "client_id": jukebox.sp_user, - }, - headers={ - "Content-Type": "application/x-www-form-urlencoded", - "Authorization": "Basic " - + base64.b64encode( - str(jukebox.sp_user + ":" + jukebox.sp_secret).encode("ascii") - ).decode("ascii"), - "Content-Type": "application/x-www-form-urlencoded", - }, - ) - if "access_token" not in r.json(): - return False - else: - await update_jukebox( - juke_id=juke_id, sp_access_token=r.json()["access_token"] - ) - except AssertionError: - something = None - return True - - -######CHECK DEVICE - - -@jukebox_ext.get("/api/v1/jukebox/jb/{juke_id}") -async def api_get_jukebox_device_check(juke_id, retry=False): - try: - jukebox = await get_jukebox(juke_id) - except: - return ( - {"error": "No Jukebox"}, - HTTPStatus.FORBIDDEN, - ) - async with httpx.AsyncClient() as client: - rDevice = await client.get( - "https://api.spotify.com/v1/me/player/devices", - timeout=40, - headers={"Authorization": "Bearer " + jukebox.sp_access_token}, - ) - - if rDevice.status_code == 204 or rDevice.status_code == 200: - return ( - rDevice, - HTTPStatus.OK, - ) - elif rDevice.status_code == 401 or rDevice.status_code == 403: - token = await api_get_token(juke_id) - if token == False: - return ( - jsonable_encoder({"error": "No device connected"}), - HTTPStatus.FORBIDDEN, - ) - elif retry: - return ( - jsonable_encoder({"error": "Failed to get auth"}), - HTTPStatus.FORBIDDEN, - ) - else: - return api_get_jukebox_device_check(juke_id, retry=True) - else: - return ( - jsonable_encoder({"error": "No device connected"}), - HTTPStatus.FORBIDDEN, - ) - - -######GET INVOICE STUFF - - -@jukebox_ext.get("/api/v1/jukebox/jb/invoice/{juke_id}/{song_id}") -async def api_get_jukebox_invoice(juke_id, song_id): - try: - jukebox = await get_jukebox(juke_id) - except: - return ( - {"error": "No Jukebox"}, - HTTPStatus.FORBIDDEN, - ) - try: - deviceCheck = await api_get_jukebox_device_check(juke_id) - devices = json.loads(deviceCheck[0].text) - deviceConnected = False - for device in devices["devices"]: - if device["id"] == jukebox.sp_device.split("-")[1]: - deviceConnected = True - if not deviceConnected: - return ( - {"error": "No device connected"}, - HTTPStatus.NOT_FOUND, - ) - except: - return ( - {"error": "No device connected"}, - HTTPStatus.NOT_FOUND, - ) - - invoice = await create_invoice( - wallet_id=jukebox.wallet, - amount=jukebox.price, - memo=jukebox.title, - extra={"tag": "jukebox"}, - ) - - jukebox_payment = await create_jukebox_payment(song_id, invoice[0], juke_id) - - return invoice, jukebox_payment - - -@jukebox_ext.get( - "/api/v1/jukebox/jb/checkinvoice/{pay_hash}/{juke_id}" -) -async def api_get_jukebox_invoice_check(pay_hash, juke_id): - try: - jukebox = await get_jukebox(juke_id) - except: - return ( - {"error": "No Jukebox"}, - HTTPStatus.FORBIDDEN, - ) - try: - status = await check_invoice_status(jukebox.wallet, pay_hash) - is_paid = not status.pending - except Exception as exc: - return {"paid": False}, HTTPStatus.OK - if is_paid: - wallet = await get_wallet(jukebox.wallet) - payment = await wallet.get_payment(pay_hash) - await payment.set_pending(False) - await update_jukebox_payment(pay_hash, paid=True) - return {"paid": True}, HTTPStatus.OK - return {"paid": False}, HTTPStatus.OK - - -@jukebox_ext.get( - "/api/v1/jukebox/jb/invoicep/{song_id}/{juke_id}/{pay_hash}" -) -async def api_get_jukebox_invoice_paid(song_id, juke_id, pay_hash, retry=False): - try: - jukebox = await get_jukebox(juke_id) - except: - return ( - jsonify({"error": "No Jukebox"}), - HTTPStatus.FORBIDDEN, - ) - await api_get_jukebox_invoice_check(pay_hash, juke_id) - jukebox_payment = await get_jukebox_payment(pay_hash) - if jukebox_payment.paid: - async with httpx.AsyncClient() as client: - r = await client.get( - "https://api.spotify.com/v1/me/player/currently-playing?market=ES", - timeout=40, - headers={"Authorization": "Bearer " + jukebox.sp_access_token}, - ) - rDevice = await client.get( - "https://api.spotify.com/v1/me/player", - timeout=40, - headers={"Authorization": "Bearer " + jukebox.sp_access_token}, - ) - isPlaying = False - if rDevice.status_code == 200: - isPlaying = rDevice.json()["is_playing"] - - if r.status_code == 204 or isPlaying == False: - async with httpx.AsyncClient() as client: - uri = ["spotify:track:" + song_id] - r = await client.put( - "https://api.spotify.com/v1/me/player/play?device_id=" - + jukebox.sp_device.split("-")[1], - json={"uris": uri}, - timeout=40, - headers={"Authorization": "Bearer " + jukebox.sp_access_token}, - ) - if r.status_code == 204: - return jukebox_payment, HTTPStatus.OK - elif r.status_code == 401 or r.status_code == 403: - token = await api_get_token(juke_id) - if token == False: - return ( - {"error": "Invoice not paid"}, - HTTPStatus.FORBIDDEN, - ) - elif retry: - return ( - {"error": "Failed to get auth"}, - HTTPStatus.FORBIDDEN, - ) - else: - return api_get_jukebox_invoice_paid( - song_id, juke_id, pay_hash, retry=True - ) - else: - return ( - {"error": "Invoice not paid"}, - HTTPStatus.FORBIDDEN, - ) - elif r.status_code == 200: - async with httpx.AsyncClient() as client: - r = await client.post( - "https://api.spotify.com/v1/me/player/queue?uri=spotify%3Atrack%3A" - + song_id - + "&device_id=" - + jukebox.sp_device.split("-")[1], - timeout=40, - headers={"Authorization": "Bearer " + jukebox.sp_access_token}, - ) - if r.status_code == 204: - return jukebox_payment, HTTPStatus.OK - - elif r.status_code == 401 or r.status_code == 403: - token = await api_get_token(juke_id) - if token == False: - return ( - {"error": "Invoice not paid"}, - HTTPStatus.OK, - ) - elif retry: - return ( - {"error": "Failed to get auth"}, - HTTPStatus.FORBIDDEN, - ) - else: - return await api_get_jukebox_invoice_paid( - song_id, juke_id, pay_hash - ) - else: - return ( - {"error": "Invoice not paid"}, - HTTPStatus.OK, - ) - elif r.status_code == 401 or r.status_code == 403: - token = await api_get_token(juke_id) - if token == False: - return ( - {"error": "Invoice not paid"}, - HTTPStatus.OK, - ) - elif retry: - return ( - {"error": "Failed to get auth"}, - HTTPStatus.FORBIDDEN, - ) - else: - return await api_get_jukebox_invoice_paid( - song_id, juke_id, pay_hash - ) - return {"error": "Invoice not paid"}, HTTPStatus.OK - - -############################GET TRACKS - - -@jukebox_ext.get("/api/v1/jukebox/jb/currently/{juke_id}") -async def api_get_jukebox_currently(juke_id, retry=False): - try: - jukebox = await get_jukebox(juke_id) - except: - return ( - {"error": "No Jukebox"}, - HTTPStatus.FORBIDDEN, - ) - async with httpx.AsyncClient() as client: - try: - r = await client.get( - "https://api.spotify.com/v1/me/player/currently-playing?market=ES", - timeout=40, - headers={"Authorization": "Bearer " + jukebox.sp_access_token}, - ) - if r.status_code == 204: - return {"error": "Nothing"}, HTTPStatus.OK - elif r.status_code == 200: - try: - response = r.json() - - track = { - "id": response["item"]["id"], - "name": response["item"]["name"], - "album": response["item"]["album"]["name"], - "artist": response["item"]["artists"][0]["name"], - "image": response["item"]["album"]["images"][0]["url"], - } - return track, HTTPStatus.OK - except: - return "Something went wrong", HTTPStatus.NOT_FOUND - - elif r.status_code == 401: - token = await api_get_token(juke_id) - if token == False: - return ( - {"error": "Invoice not paid"}, - HTTPStatus.FORBIDDEN, - ) - elif retry: - return ( - {"error": "Failed to get auth"}, - HTTPStatus.FORBIDDEN, - ) - else: - return await api_get_jukebox_currently(juke_id, retry=True) - else: - return "Something went wrong", HTTPStatus.NOT_FOUND - except AssertionError: - return "Something went wrong", HTTPStatus.NOT_FOUND diff --git a/lnbits/extensions/livestream/README.md b/lnbits/extensions/livestream/README.md deleted file mode 100644 index 4e88e7bc..00000000 --- a/lnbits/extensions/livestream/README.md +++ /dev/null @@ -1,45 +0,0 @@ -# DJ Livestream - -## Help DJ's and music producers conduct music livestreams - -LNBits Livestream extension produces a static QR code that can be shown on screen while livestreaming a DJ set for example. If someone listening to the livestream likes a song and want to support the DJ and/or the producer he can scan the QR code with a LNURL-pay capable wallet. - -When scanned, the QR code sends up information about the song playing at the moment (name and the producer of that song). Also, if the user likes the song and would like to support the producer, he can send a tip and a message for that specific track. If the user sends an amount over a specific threshold they will be given a link to download it (optional). - -The revenue will be sent to a wallet created specifically for that producer, with optional revenue splitting between the DJ and the producer. - -[**Wallets supporting LNURL**](https://github.com/fiatjaf/awesome-lnurl#wallets) - -[](https://youtu.be/zDrSWShKz7k 'video tutorial offline shop') - -## Usage - -1. Start by adding a track\ -  - - set the producer, or choose an existing one - - set the track name - - define a minimum price where a user can download the track - - set the download URL, where user will be redirected if he tips the livestream and the tip is equal or above the set price\ -  -2. Adjust the percentage of the pay you want to take from the user's tips. 10%, the default, means that the DJ will keep 10% of all the tips sent by users. The other 90% will go to an auto generated producer wallet\ -  -3. For every different producer added, when adding tracks, a wallet is generated for them\ -  -4. On the bottom of the LNBits DJ Livestream extension you'll find the static QR code ([LNURL-pay](https://github.com/lnbits/lnbits/blob/master/lnbits/extensions/lnurlp/README.md)) you can add to the livestream or if you're a street performer you can print it and have it displayed -5. After all tracks and producers are added, you can start "playing" songs\ -  -6. You'll see the current track playing and a green icon indicating active track also\ -  -7. When a user scans the QR code, and sends a tip, you'll receive 10%, in the example case, in your wallet and the producer's wallet will get the rest. For example someone tips 100 sats, you'll get 10 sats and the producer will get 90 sats - - producer's wallet receiving 18 sats from 20 sats tips\ -  - -## Use cases - -You can print the QR code and display it on a live gig, a street performance, etc... OR you can use the QR as an overlay in an online stream of you playing music, doing a DJ set, making a podcast. - -You can use the extension's API to trigger updates for the current track, update fees, add tracks... - -## Sponsored by - -[](https://cryptograffiti.com/) diff --git a/lnbits/extensions/livestream/__init__.py b/lnbits/extensions/livestream/__init__.py deleted file mode 100644 index d8f61fe0..00000000 --- a/lnbits/extensions/livestream/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -from quart import Blueprint - -from lnbits.db import Database - -db = Database("ext_livestream") - -livestream_ext: Blueprint = Blueprint( - "livestream", __name__, static_folder="static", template_folder="templates" -) - - -from .views_api import * # noqa -from .views import * # noqa -from .lnurl import * # noqa -from .tasks import register_listeners - -from lnbits.tasks import record_async - -livestream_ext.record(record_async(register_listeners)) diff --git a/lnbits/extensions/livestream/config.json b/lnbits/extensions/livestream/config.json deleted file mode 100644 index 12ba6b79..00000000 --- a/lnbits/extensions/livestream/config.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "DJ Livestream", - "short_description": "Sell tracks and split revenue (lnurl-pay)", - "icon": "speaker", - "contributors": [ - "fiatjaf", - "cryptograffiti" - ], - "hidden": false -} diff --git a/lnbits/extensions/livestream/crud.py b/lnbits/extensions/livestream/crud.py deleted file mode 100644 index 47854dbd..00000000 --- a/lnbits/extensions/livestream/crud.py +++ /dev/null @@ -1,199 +0,0 @@ -from typing import List, Optional - -from lnbits.core.crud import create_account, create_wallet -from lnbits.db import SQLITE -from . import db -from .models import Livestream, Track, Producer - - -async def create_livestream(*, wallet_id: str) -> int: - returning = "" if db.type == SQLITE else "RETURNING ID" - method = db.execute if db.type == SQLITE else db.fetchone - - result = await (method)( - f""" - INSERT INTO livestream.livestreams (wallet) - VALUES (?) - {returning} - """, - (wallet_id,), - ) - - if db.type == SQLITE: - return result._result_proxy.lastrowid - else: - return result[0] - - -async def get_livestream(ls_id: int) -> Optional[Livestream]: - row = await db.fetchone( - "SELECT * FROM livestream.livestreams WHERE id = ?", (ls_id,) - ) - return Livestream(**dict(row)) if row else None - - -async def get_livestream_by_track(track_id: int) -> Optional[Livestream]: - row = await db.fetchone( - """ - SELECT livestreams.* FROM livestream.livestreams - INNER JOIN tracks ON tracks.livestream = livestreams.id - WHERE tracks.id = ? - """, - (track_id,), - ) - return Livestream(**dict(row)) if row else None - - -async def get_or_create_livestream_by_wallet(wallet: str) -> Optional[Livestream]: - row = await db.fetchone( - "SELECT * FROM livestream.livestreams WHERE wallet = ?", (wallet,) - ) - - if not row: - # create on the fly - ls_id = await create_livestream(wallet_id=wallet) - return await get_livestream(ls_id) - - return Livestream(**dict(row)) if row else None - - -async def update_current_track(ls_id: int, track_id: Optional[int]): - await db.execute( - "UPDATE livestream.livestreams SET current_track = ? WHERE id = ?", - (track_id, ls_id), - ) - - -async def update_livestream_fee(ls_id: int, fee_pct: int): - await db.execute( - "UPDATE livestream.livestreams SET fee_pct = ? WHERE id = ?", - (fee_pct, ls_id), - ) - - -async def add_track( - livestream: int, - name: str, - download_url: Optional[str], - price_msat: int, - producer: Optional[int], -) -> int: - result = await db.execute( - """ - INSERT INTO livestream.tracks (livestream, name, download_url, price_msat, producer) - VALUES (?, ?, ?, ?, ?) - """, - (livestream, name, download_url, price_msat, producer), - ) - return result._result_proxy.lastrowid - - -async def update_track( - livestream: int, - track_id: int, - name: str, - download_url: Optional[str], - price_msat: int, - producer: int, -) -> int: - result = await db.execute( - """ - UPDATE livestream.tracks SET - name = ?, - download_url = ?, - price_msat = ?, - producer = ? - WHERE livestream = ? AND id = ? - """, - (name, download_url, price_msat, producer, livestream, track_id), - ) - return result._result_proxy.lastrowid - - -async def get_track(track_id: Optional[int]) -> Optional[Track]: - if not track_id: - return None - - row = await db.fetchone( - """ - SELECT id, download_url, price_msat, name, producer - FROM livestream.tracks WHERE id = ? - """, - (track_id,), - ) - return Track(**dict(row)) if row else None - - -async def get_tracks(livestream: int) -> List[Track]: - rows = await db.fetchall( - """ - SELECT id, download_url, price_msat, name, producer - FROM livestream.tracks WHERE livestream = ? - """, - (livestream,), - ) - return [Track(**dict(row)) for row in rows] - - -async def delete_track_from_livestream(livestream: int, track_id: int): - await db.execute( - """ - DELETE FROM livestream.tracks WHERE livestream = ? AND id = ? - """, - (livestream, track_id), - ) - - -async def add_producer(livestream: int, name: str) -> int: - name = name.strip() - - existing = await db.fetchall( - """ - SELECT id FROM livestream.producers - WHERE livestream = ? AND lower(name) = ? - """, - (livestream, name.lower()), - ) - if existing: - return existing[0].id - - user = await create_account() - wallet = await create_wallet(user_id=user.id, wallet_name="livestream: " + name) - - returning = "" if db.type == SQLITE else "RETURNING ID" - method = db.execute if db.type == SQLITE else db.fetchone - - result = await method( - f""" - INSERT INTO livestream.producers (livestream, name, "user", wallet) - VALUES (?, ?, ?, ?) - {returning} - """, - (livestream, name, user.id, wallet.id), - ) - if db.type == SQLITE: - return result._result_proxy.lastrowid - else: - return result[0] - - -async def get_producer(producer_id: int) -> Optional[Producer]: - row = await db.fetchone( - """ - SELECT id, "user", wallet, name - FROM livestream.producers WHERE id = ? - """, - (producer_id,), - ) - return Producer(**dict(row)) if row else None - - -async def get_producers(livestream: int) -> List[Producer]: - rows = await db.fetchall( - """ - SELECT id, "user", wallet, name - FROM livestream.producers WHERE livestream = ? - """, - (livestream,), - ) - return [Producer(**dict(row)) for row in rows] diff --git a/lnbits/extensions/livestream/lnurl.py b/lnbits/extensions/livestream/lnurl.py deleted file mode 100644 index 3b9e7e31..00000000 --- a/lnbits/extensions/livestream/lnurl.py +++ /dev/null @@ -1,114 +0,0 @@ -import hashlib -import math -from quart import jsonify, url_for, request -from lnurl import LnurlPayResponse, LnurlPayActionResponse, LnurlErrorResponse # type: ignore - -from lnbits.core.services import create_invoice - -from . import livestream_ext -from .crud import get_livestream, get_livestream_by_track, get_track - - -@livestream_ext.route("/lnurl/Add tracks, profit.
-GET
- /livestream/api/v1/livestream
- Headers
-{"X-Api-Key": <invoice_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-[<livestream_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/livestream -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- PUT
- /livestream/api/v1/livestream/track/<track_id>
- Headers
-{"X-Api-Key": <invoice_key>}-
Body (application/json)
-- Returns 201 CREATED (application/json) -
-Curl example
-curl -X PUT {{ request.url_root
- }}api/v1/livestream/track/<track_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- PUT
- /livestream/api/v1/livestream/fee/<fee_pct>
- Headers
-{"X-Api-Key": <invoice_key>}-
Body (application/json)
-- Returns 201 CREATED (application/json) -
-Curl example
-curl -X PUT {{ request.url_root
- }}api/v1/livestream/fee/<fee_pct> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- POST
- /livestream/api/v1/livestream/tracks
- Headers
-{"X-Api-Key": <invoice_key>}-
Body (application/json)
-{"name": <string>, "download_url": <string>,
- "price_msat": <integer>, "producer_id": <integer>,
- "producer_name": <string>}
- - Returns 201 CREATED (application/json) -
-Curl example
-curl -X POST {{ request.url_root }}api/v1/livestream/tracks -d
- '{"name": <string>, "download_url": <string>,
- "price_msat": <integer>, "producer_id": <integer>,
- "producer_name": <string>}' -H "Content-type: application/json"
- -H "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
-
- DELETE
- /livestream/api/v1/livestream/tracks/<track_id>
- Headers
-{"X-Api-Key": <invoice_key>}-
Returns 204 NO CONTENT
-Curl example
-curl -X DELETE {{ request.url_root
- }}api/v1/livestream/tracks/<track_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
-
-
-
-
-
-
-
-
- Copy LNURL-pay code
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/livestream/views.py b/lnbits/extensions/livestream/views.py
deleted file mode 100644
index 5628c00c..00000000
--- a/lnbits/extensions/livestream/views.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from quart import g, render_template, request, redirect
-from http import HTTPStatus
-
-from lnbits.decorators import check_user_exists, validate_uuids
-from lnbits.core.models import Payment
-from lnbits.core.crud import get_wallet_payment
-
-from . import livestream_ext
-from .crud import get_track, get_livestream_by_track
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@livestream_ext.route("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("livestream/index.html", {"request": request,"user":g.user})
-
-
-@livestream_ext.route("/track/
-
-
-
-
-
-
-
-
-
-
- {% raw %}
-
-
- Name
- Producer
- Price
- Download URL
-
-
-
-
-
-
- {{ props.row.name }}
-
- {{ producersMap[props.row.producer].name }}
-
- {{ Math.round(props.row.price_msat / 1000) }}
- {{ props.row.download_url }}
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
- {% raw %}
-
-
- Name
- Wallet
-
-
-
-
- {{ props.row.name }}
-
-
- {{ props.row.wallet }}
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copy LNURL-pay code
-
-
-
-
-
-
-
-
-
- {% raw %}
-
- {{ nextCurrentTrack && nextCurrentTrack ===
- livestream.current_track ? 'Stop' : 'Set' }} current track
-
- {% endraw %}
-
-
-
-
-
-
- Set percent rate
-
-
-
-
-
- Tracks
-
- Add new track
-
-
-
-
-
- Producers
-
-
-
-
-
- {% include "livestream/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} Livestream extension -
-- Standalone QR Code for this track -
- -
-
-
-
- Update track
- Add track
-
-
-
- Cancel
-
- lndhub Extension
-*connect to your lnbits wallet from BlueWallet or Zeus*
- -Lndhub has nothing to do with lnd, it is just the name of the HTTP/JSON protocol https://bluewallet.io/ uses to talk to their Lightning custodian server at https://lndhub.io/. - -Despite not having been planned to this, Lndhub because somewhat a standard for custodian wallet communication when https://t.me/lntxbot and https://zeusln.app/ implemented the same interface. And with this extension LNBits joins the same club. diff --git a/lnbits/extensions/lndhub/__init__.py b/lnbits/extensions/lndhub/__init__.py deleted file mode 100644 index 7610b0a3..00000000 --- a/lnbits/extensions/lndhub/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -from quart import Blueprint -from lnbits.db import Database - -db = Database("ext_lndhub") - -lndhub_ext: Blueprint = Blueprint( - "lndhub", __name__, static_folder="static", template_folder="templates" -) - - -from .views_api import * # noqa -from .views import * # noqa diff --git a/lnbits/extensions/lndhub/config.json b/lnbits/extensions/lndhub/config.json deleted file mode 100644 index 6285ff80..00000000 --- a/lnbits/extensions/lndhub/config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "LndHub", - "short_description": "Access lnbits from BlueWallet or Zeus", - "icon": "navigation", - "contributors": ["fiatjaf"] -} diff --git a/lnbits/extensions/lndhub/decorators.py b/lnbits/extensions/lndhub/decorators.py deleted file mode 100644 index c9c3bb71..00000000 --- a/lnbits/extensions/lndhub/decorators.py +++ /dev/null @@ -1,29 +0,0 @@ -from base64 import b64decode -from quart import jsonify, g, request -from functools import wraps - -from lnbits.core.crud import get_wallet_for_key - - -def check_wallet(requires_admin=False): - def wrap(view): - @wraps(view) - async def wrapped_view(**kwargs): - token = request.headers["Authorization"].split("Bearer ")[1] - key_type, key = b64decode(token).decode("utf-8").split(":") - - if requires_admin and key_type != "admin": - return jsonify( - {"error": True, "code": 2, "message": "insufficient permissions"} - ) - - g.wallet = await get_wallet_for_key(key, key_type) - if not g.wallet: - return jsonify( - {"error": True, "code": 2, "message": "insufficient permissions"} - ) - return await view(**kwargs) - - return wrapped_view - - return wrap diff --git a/lnbits/extensions/lndhub/migrations.py b/lnbits/extensions/lndhub/migrations.py deleted file mode 100644 index d6ea5fde..00000000 --- a/lnbits/extensions/lndhub/migrations.py +++ /dev/null @@ -1,2 +0,0 @@ -async def migrate(): - pass diff --git a/lnbits/extensions/lndhub/templates/lndhub/_instructions.html b/lnbits/extensions/lndhub/templates/lndhub/_instructions.html deleted file mode 100644 index 4db79aba..00000000 --- a/lnbits/extensions/lndhub/templates/lndhub/_instructions.html +++ /dev/null @@ -1,35 +0,0 @@ --
-
- - Install either Zeus or - BlueWallet; - -
-
- Go to
Add a wallet / Import walleton BlueWallet or -Settings / Add a new nodeon Zeus. -
- - Select the desired wallet on this page; -
- Scan one of the two QR codes from the mobile wallet. -
-
-
- - Invoice URLs mean the mobile wallet will only have the - authorization to read your payments and invoices and generate new - invoices. - -
- - Admin URLs mean the mobile wallet will be able to pay - invoices.. - -
- LndHub is a protocol invented by - BlueWallet that allows mobile - wallets to query payments and balances, generate invoices and make - payments from accounts that exist on a server. The protocol is a - collection of HTTP endpoints exposed through the internet. -
-- For a wallet that supports it, reading a QR code that contains the URL - along with secret access credentials should enable access. Currently it - is supported by Zeus and - BlueWallet. -
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/lndhub/utils.py b/lnbits/extensions/lndhub/utils.py
deleted file mode 100644
index 3db6317a..00000000
--- a/lnbits/extensions/lndhub/utils.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from binascii import unhexlify
-
-from lnbits.bolt11 import Invoice
-
-
-def to_buffer(payment_hash: str):
- return {"type": "Buffer", "data": [b for b in unhexlify(payment_hash)]}
-
-
-def decoded_as_lndhub(invoice: Invoice):
- return {
- "destination": invoice.payee,
- "payment_hash": invoice.payment_hash,
- "num_satoshis": invoice.amount_msat / 1000,
- "timestamp": str(invoice.date),
- "expiry": str(invoice.expiry),
- "description": invoice.description,
- "fallback_addr": "",
- "cltv_expiry": invoice.min_final_cltv_expiry,
- "route_hints": "",
- }
diff --git a/lnbits/extensions/lndhub/views.py b/lnbits/extensions/lndhub/views.py
deleted file mode 100644
index dbe3f0de..00000000
--- a/lnbits/extensions/lndhub/views.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from quart import render_template, g
-
-from lnbits.decorators import check_user_exists, validate_uuids
-from . import lndhub_ext
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@lndhub_ext.route("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def lndhub_index(request: Request):
- return await templates.TemplateResponse("lndhub/index.html", {"request": request,"user":g.user})
diff --git a/lnbits/extensions/lndhub/views_api.py b/lnbits/extensions/lndhub/views_api.py
deleted file mode 100644
index 057c8d08..00000000
--- a/lnbits/extensions/lndhub/views_api.py
+++ /dev/null
@@ -1,245 +0,0 @@
-import time
-from base64 import urlsafe_b64encode
-from quart import jsonify, g, request
-
-from fastapi import FastAPI, Query
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import JSONResponse
-from pydantic import BaseModel
-
-from lnbits.core.services import pay_invoice, create_invoice
-from lnbits.core.crud import get_payments, delete_expired_invoices
-from lnbits.decorators import api_validate_post_request
-from lnbits.settings import WALLET
-from lnbits import bolt11
-
-from . import lndhub_ext
-from .decorators import check_wallet
-from .utils import to_buffer, decoded_as_lndhub
-
-
-@lndhub_ext.get("/ext/getinfo")
-async def lndhub_getinfo():
- return {"error": True, "code": 1, "message": "bad auth"}
-
-
-@lndhub_ext.post("/ext/auth")
-# @api_validate_post_request(
-# schema={
-# "login": {"type": "string", "required": True, "excludes": "refresh_token"},
-# "password": {"type": "string", "required": True, "excludes": "refresh_token"},
-# "refresh_token": {
-# "type": "string",
-# "required": True,
-# "excludes": ["login", "password"],
-# },
-# }
-# )
-async def lndhub_auth(login: str, password: str, refresh_token: str): #missing the "excludes" thing
- token = (
- refresh_token
- if refresh_token
- else urlsafe_b64encode(
- (login + ":" + password).encode("utf-8")
- ).decode("ascii")
- )
- return {"refresh_token": token, "access_token": token}
-
-
-@lndhub_ext.post("/ext/addinvoice")
-@check_wallet()
-# @api_validate_post_request(
-# schema={
-# "amt": {"type": "string", "required": True},
-# "memo": {"type": "string", "required": True},
-# "preimage": {"type": "string", "required": False},
-# }
-# )
-async def lndhub_addinvoice(amt: str, memo: str, preimage: str = ""):
- try:
- _, pr = await create_invoice(
- wallet_id=g.wallet.id,
- amount=int(amt),
- memo=memo,
- extra={"tag": "lndhub"},
- )
- except Exception as e:
- return
- {
- "error": True,
- "code": 7,
- "message": "Failed to create invoice: " + str(e),
- }
-
-
- invoice = bolt11.decode(pr)
- return
- {
- "pay_req": pr,
- "payment_request": pr,
- "add_index": "500",
- "r_hash": to_buffer(invoice.payment_hash),
- "hash": invoice.payment_hash,
- }
-
-
-
-@lndhub_ext.post("/ext/payinvoice")
-@check_wallet(requires_admin=True)
-# @api_validate_post_request(schema={"invoice": {"type": "string", "required": True}})
-async def lndhub_payinvoice(invoice: str):
- try:
- await pay_invoice(
- wallet_id=g.wallet.id,
- payment_request=invoice,
- extra={"tag": "lndhub"},
- )
- except Exception as e:
- return
- {
- "error": True,
- "code": 10,
- "message": "Payment failed: " + str(e),
- }
-
-
- invoice: bolt11.Invoice = bolt11.decode(invoice)
- return
- {
- "payment_error": "",
- "payment_preimage": "0" * 64,
- "route": {},
- "payment_hash": invoice.payment_hash,
- "decoded": decoded_as_lndhub(invoice),
- "fee_msat": 0,
- "type": "paid_invoice",
- "fee": 0,
- "value": invoice.amount_msat / 1000,
- "timestamp": int(time.time()),
- "memo": invoice.description,
- }
-
-
-
-@lndhub_ext.get("/ext/balance")
-@check_wallet()
-async def lndhub_balance():
- return {"BTC": {"AvailableBalance": g.wallet.balance}}
-
-
-@lndhub_ext.get("/ext/gettxs")
-@check_wallet()
-async def lndhub_gettxs():
- for payment in await get_payments(
- wallet_id=g.wallet.id,
- complete=False,
- pending=True,
- outgoing=True,
- incoming=False,
- exclude_uncheckable=True,
- ):
- await payment.set_pending(
- (await WALLET.get_payment_status(payment.checking_id)).pending
- )
-
- limit = int(request.args.get("limit", 200))
- return
- [
- {
- "payment_preimage": payment.preimage,
- "payment_hash": payment.payment_hash,
- "fee_msat": payment.fee * 1000,
- "type": "paid_invoice",
- "fee": payment.fee,
- "value": int(payment.amount / 1000),
- "timestamp": payment.time,
- "memo": payment.memo
- if not payment.pending
- else "Payment in transition",
- }
- for payment in reversed(
- (
- await get_payments(
- wallet_id=g.wallet.id,
- pending=True,
- complete=True,
- outgoing=True,
- incoming=False,
- )
- )[:limit]
- )
- ]
-
-
-
-@lndhub_ext.get("/ext/getuserinvoices")
-@check_wallet()
-async def lndhub_getuserinvoices():
- await delete_expired_invoices()
- for invoice in await get_payments(
- wallet_id=g.wallet.id,
- complete=False,
- pending=True,
- outgoing=False,
- incoming=True,
- exclude_uncheckable=True,
- ):
- await invoice.set_pending(
- (await WALLET.get_invoice_status(invoice.checking_id)).pending
- )
-
- limit = int(request.args.get("limit", 200))
- return
- [
- {
- "r_hash": to_buffer(invoice.payment_hash),
- "payment_request": invoice.bolt11,
- "add_index": "500",
- "description": invoice.memo,
- "payment_hash": invoice.payment_hash,
- "ispaid": not invoice.pending,
- "amt": int(invoice.amount / 1000),
- "expire_time": int(time.time() + 1800),
- "timestamp": invoice.time,
- "type": "user_invoice",
- }
- for invoice in reversed(
- (
- await get_payments(
- wallet_id=g.wallet.id,
- pending=True,
- complete=True,
- incoming=True,
- outgoing=False,
- )
- )[:limit]
- )
- ]
-
-
-
-@lndhub_ext.get("/ext/getbtc")
-@check_wallet()
-async def lndhub_getbtc():
- "load an address for incoming onchain btc"
- return []
-
-
-@lndhub_ext.get("/ext/getpending")
-@check_wallet()
-async def lndhub_getpending():
- "pending onchain transactions"
- return []
-
-
-@lndhub_ext.get("/ext/decodeinvoice")
-async def lndhub_decodeinvoice():
- invoice = request.args.get("invoice")
- inv = bolt11.decode(invoice)
- return decoded_as_lndhub(inv)
-
-
-@lndhub_ext.get("/ext/checkrouteinvoice")
-async def lndhub_checkrouteinvoice():
- "not implemented on canonical lndhub"
- pass
diff --git a/lnbits/extensions/lnticket/views.py b/lnbits/extensions/lnticket/views.py
index 62002b76..f7f50e37 100644
--- a/lnbits/extensions/lnticket/views.py
+++ b/lnbits/extensions/lnticket/views.py
@@ -9,6 +9,7 @@ from http import HTTPStatus
from . import lnticket_ext, lnticket_renderer
from .crud import get_form
from fastapi import FastAPI, Request
+from fastapi.params import Depends
from fastapi.templating import Jinja2Templates
templates = Jinja2Templates(directory="templates")
@@ -16,7 +17,7 @@ templates = Jinja2Templates(directory="templates")
@lnticket_ext.get("/", response_class=HTMLResponse)
# not needed as we automatically get the user with the given ID
# If no user with this ID is found, an error is raised
-# @validate_uuids(["usr"], required=True)
+# @validate_uuids(["usr"], required=True)
# @check_user_exists()
async def index(request: Request, user: User = Depends(check_user_exists)):
return lnticket_renderer().TemplateResponse("lnticket/index.html", {"request": request,"user": user.dict()})
diff --git a/lnbits/extensions/lnurlp/__init__.py b/lnbits/extensions/lnurlp/__init__.py
index d820b197..af12d57f 100644
--- a/lnbits/extensions/lnurlp/__init__.py
+++ b/lnbits/extensions/lnurlp/__init__.py
@@ -1,18 +1,49 @@
-from quart import Blueprint
+import asyncio
+
+from fastapi import APIRouter, FastAPI
+from fastapi.staticfiles import StaticFiles
+from starlette.routing import Mount
+
from lnbits.db import Database
+from lnbits.helpers import template_renderer
+from lnbits.tasks import catch_everything_and_restart
db = Database("ext_lnurlp")
-lnurlp_ext: Blueprint = Blueprint(
- "lnurlp", __name__, static_folder="static", template_folder="templates"
+lnurlp_static_files = [
+ {
+ "path": "/lnurlp/static",
+ "app": StaticFiles(directory="lnbits/extensions/lnurlp/static"),
+ "name": "lnurlp_static",
+ }
+]
+
+lnurlp_ext: APIRouter = APIRouter(
+ prefix="/lnurlp",
+ tags=["lnurlp"]
+ # "lnurlp", __name__, static_folder="static", template_folder="templates"
)
+def lnurlp_renderer():
+ return template_renderer(
+ [
+ "lnbits/extensions/lnurlp/templates",
+ ]
+ )
+
from .views_api import * # noqa
from .views import * # noqa
+from .tasks import wait_for_paid_invoices
from .lnurl import * # noqa
-from .tasks import register_listeners
-from lnbits.tasks import record_async
+def lnurlp_start():
+ loop = asyncio.get_event_loop()
+ loop.create_task(catch_everything_and_restart(wait_for_paid_invoices))
-lnurlp_ext.record(record_async(register_listeners))
+
+
+
+# from lnbits.tasks import record_async
+
+# lnurlp_ext.record(record_async(register_listeners))
diff --git a/lnbits/extensions/lnurlp/crud.py b/lnbits/extensions/lnurlp/crud.py
index b1744a64..892d9e98 100644
--- a/lnbits/extensions/lnurlp/crud.py
+++ b/lnbits/extensions/lnurlp/crud.py
@@ -2,25 +2,16 @@ from typing import List, Optional, Union
from lnbits.db import SQLITE
from . import db
-from .models import PayLink
+from .models import PayLink, CreatePayLinkData
async def create_pay_link(
- *,
- wallet_id: str,
- description: str,
- min: int,
- max: int,
- comment_chars: int = 0,
- currency: Optional[str] = None,
- webhook_url: Optional[str] = None,
- success_text: Optional[str] = None,
- success_url: Optional[str] = None,
+ data: CreatePayLinkData,
+ wallet_id: str
) -> PayLink:
returning = "" if db.type == SQLITE else "RETURNING ID"
method = db.execute if db.type == SQLITE else db.fetchone
-
result = await (method)(
f"""
INSERT INTO lnurlp.pay_links (
@@ -41,14 +32,14 @@ async def create_pay_link(
""",
(
wallet_id,
- description,
- min,
- max,
- webhook_url,
- success_text,
- success_url,
- comment_chars,
- currency,
+ data.description,
+ data.min,
+ data.max,
+ data.webhook_url,
+ data.success_text,
+ data.success_url,
+ data.comment_chars,
+ data.currency,
),
)
if db.type == SQLITE:
diff --git a/lnbits/extensions/lnurlp/lnurl.py b/lnbits/extensions/lnurlp/lnurl.py
index ac0605b3..ca17646f 100644
--- a/lnbits/extensions/lnurlp/lnurl.py
+++ b/lnbits/extensions/lnurlp/lnurl.py
@@ -1,7 +1,7 @@
import hashlib
import math
from http import HTTPStatus
-from quart import jsonify, url_for, request
+from fastapi import FastAPI, Request
from lnurl import LnurlPayResponse, LnurlPayActionResponse, LnurlErrorResponse # type: ignore
from lnbits.core.services import create_invoice
@@ -11,18 +11,19 @@ from . import lnurlp_ext
from .crud import increment_pay_link
-@lnurlp_ext.route("/api/v1/lnurl/
-
-
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copy LndHub {{type}} URL
-
-
-
-
-
-
-
- {% include "lndhub/_instructions.html" %}
-
-
-
-
-- {{SITE_TITLE}} LndHub extension -
-Curl example
curl -X GET {{ request.url_root }}api/v1/links -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
+ user.wallets[0].inkey }}"
@@ -27,7 +27,8 @@
GET /lnurlp/api/v1/links/<pay_id>GET
+ /lnurlp/api/v1/links/<pay_id>
Headers
{"X-Api-Key": <invoice_key>}@@ -39,7 +40,7 @@
Curl example
curl -X GET {{ request.url_root }}api/v1/links/<pay_id> -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
+ "X-Api-Key: {{ user.wallets[0].inkey }}"
Headers
{"X-Api-Key": <admin_key>}Body (application/json)
-{"description": <string> "amount": <integer> "max": <integer> "min": <integer> "comment_chars": <integer>}
+ {"description": <string> "amount": <integer> "max":
+ <integer> "min": <integer> "comment_chars":
+ <integer>}
Returns 201 CREATED (application/json)
@@ -64,8 +69,10 @@Curl example
curl -X POST {{ request.url_root }}api/v1/links -d '{"description":
- <string>, "amount": <integer>, "max": <integer>, "min": <integer>, "comment_chars": <integer>}' -H "Content-type:
- application/json" -H "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
+ <string>, "amount": <integer>, "max": <integer>,
+ "min": <integer>, "comment_chars": <integer>}' -H
+ "Content-type: application/json" -H "X-Api-Key: {{
+ user.wallets[0].adminkey }}"
@@ -95,7 +102,7 @@
>curl -X PUT {{ request.url_root }}api/v1/links/<pay_id> -d
'{"description": <string>, "amount": <integer>}' -H
"Content-type: application/json" -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
+ user.wallets[0].adminkey }}"
@@ -120,7 +127,7 @@
Curl example
curl -X DELETE {{ request.url_root }}api/v1/links/<pay_id> -H
- "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
+ "X-Api-Key: {{ user.wallets[0].adminkey }}"
diff --git a/lnbits/extensions/lnurlp/templates/lnurlp/display.html b/lnbits/extensions/lnurlp/templates/lnurlp/display.html
index a2e0389c..08e4de15 100644
--- a/lnbits/extensions/lnurlp/templates/lnurlp/display.html
+++ b/lnbits/extensions/lnurlp/templates/lnurlp/display.html
@@ -4,10 +4,10 @@
- Copy LNURL
diff --git a/lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html b/lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html
index a6a98f4d..4e3152e8 100644
--- a/lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html
+++ b/lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html
@@ -1,7 +1,7 @@
{% extends "print.html" %} {% block page %}
-
Ngrok
-Serve lnbits over https for free using ngrok
- -
-
-How it works
- -When enabled, ngrok creates a tunnel to ngrok.io with https support and tells you the https web address where you can access your lnbits instance. If you are not the first user to enable it, it doesn't create a new one, it just tells you the existing one. Useful for creating/managing/using lnurls, which must be served either via https or via tor. Note that if you restart your device, your device will generate a new url. If anyone is using your old one for wallets, lnurls, etc., whatever they are doing will stop working. - -Installation
- -Check the Extensions page on your instance of lnbits. If you have copy of lnbits with ngrok as one of the built in extensions, click Enable -- that's the only thing you need to do to install it. - -If your copy of lnbits does not have ngrok as one of the built in extensions, stop lnbits, create go into your lnbits folder, and run this command: ./venv/bin/pip install pyngrok. Then go into the lnbits subdirectory and the extensions subdirectory within that. (So lnbits > lnbits > extensions.) Create a new subdirectory in there called freetunnel, download this repository as a zip file, and unzip it in the freetunnel directory. If your unzipper creates a new "freetunnel" subdirectory, take everything out of there and put it in the freetunnel directory you created. Then go back to the top level lnbits directory and run these commands: - -``` -./venv/bin/quart assets -./venv/bin/quart migrate -./venv/bin/hypercorn -k trio --bind 0.0.0.0:5000 'lnbits.app:create_app()' -``` diff --git a/lnbits/extensions/ngrok/__init__.py b/lnbits/extensions/ngrok/__init__.py deleted file mode 100644 index 4933aa7f..00000000 --- a/lnbits/extensions/ngrok/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from quart import Blueprint -from lnbits.db import Database - -db = Database("ext_ngrok") - -ngrok_ext: Blueprint = Blueprint("ngrok", __name__, template_folder="templates") - -from .views import * # noqa diff --git a/lnbits/extensions/ngrok/config.json.example b/lnbits/extensions/ngrok/config.json.example deleted file mode 100644 index 58e9ff8e..00000000 --- a/lnbits/extensions/ngrok/config.json.example +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Ngrok", - "short_description": "Serve lnbits over https for free using ngrok", - "icon": "trip_origin", - "contributors": ["supertestnet"] -} diff --git a/lnbits/extensions/ngrok/migrations.py b/lnbits/extensions/ngrok/migrations.py deleted file mode 100644 index f9b8b37d..00000000 --- a/lnbits/extensions/ngrok/migrations.py +++ /dev/null @@ -1,11 +0,0 @@ -# async def m001_initial(db): - -# await db.execute( -# """ -# CREATE TABLE example.example ( -# id TEXT PRIMARY KEY, -# wallet TEXT NOT NULL, -# time TIMESTAMP NOT NULL DEFAULT """ + db.timestamp_now + """ -# ); -# """ -# ) diff --git a/lnbits/extensions/ngrok/templates/ngrok/index.html b/lnbits/extensions/ngrok/templates/ngrok/index.html deleted file mode 100644 index 3af4fa44..00000000 --- a/lnbits/extensions/ngrok/templates/ngrok/index.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends "base.html" %} {% from "macros.jinja" import window_vars with context -%} {% block page %} - -
-
-
-{% endblock %}{% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/ngrok/views.py b/lnbits/extensions/ngrok/views.py
deleted file mode 100644
index a7130021..00000000
--- a/lnbits/extensions/ngrok/views.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from quart import g, render_template
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from pyngrok import conf, ngrok
-from . import ngrok_ext
-from os import getenv
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-def log_event_callback(log):
- string = str(log)
- string2 = string[string.find('url="https') : string.find('url="https') + 40]
- if string2:
- string3 = string2
- string4 = string3[4:]
- global string5
- string5 = string4.replace('"', "")
-
-
-conf.get_default().log_event_callback = log_event_callback
-
-port = getenv("PORT")
-ngrok_tunnel = ngrok.connect(port)
-
-
-@ngrok_ext.get("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("ngrok/index.html", {"request": request, "ngrok":string5, "user":g.user})
diff --git a/lnbits/extensions/paywall/README.md b/lnbits/extensions/paywall/README.md
deleted file mode 100644
index 738485e2..00000000
--- a/lnbits/extensions/paywall/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Paywall
-
-## Hide content behind a paywall, a user has to pay some amount to access your hidden content
-
-A Paywall is a way of restricting to content via a purchase or paid subscription. For example to read a determined blog post, or to continue reading further, to access a downloads area, etc...
-
-## Usage
-
-1. Create a paywall by clicking "NEW PAYWALL"\
- 
-2. Fill the options for your PAYWALL
- - select the wallet
- - set the link that will be unlocked after a successful payment
- - give your paywall a _Title_
- - an optional small description
- - and set an amount a user must pay to access the hidden content. Note this is the minimum amount, a user can over pay if they wish
- - if _Remember payments_ is checked, a returning paying user won't have to pay again for the same content.\
- 
-3. You can then use your paywall link to secure your awesome content\
- 
-4. When a user wants to access your hidden content, he can use the minimum amount or increase and click the "_Check icon_" to generate an invoice, user will then be redirected to the content page\
- 
diff --git a/lnbits/extensions/paywall/__init__.py b/lnbits/extensions/paywall/__init__.py
deleted file mode 100644
index cf9570a1..00000000
--- a/lnbits/extensions/paywall/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from quart import Blueprint
-from lnbits.db import Database
-
-db = Database("ext_paywall")
-
-paywall_ext: Blueprint = Blueprint(
- "paywall", __name__, static_folder="static", template_folder="templates"
-)
-
-
-from .views_api import * # noqa
-from .views import * # noqa
diff --git a/lnbits/extensions/paywall/config.json b/lnbits/extensions/paywall/config.json
deleted file mode 100644
index d08ce7ba..00000000
--- a/lnbits/extensions/paywall/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "Paywall",
- "short_description": "Create paywalls for content",
- "icon": "policy",
- "contributors": ["eillarra"]
-}
diff --git a/lnbits/extensions/paywall/crud.py b/lnbits/extensions/paywall/crud.py
deleted file mode 100644
index c13aba43..00000000
--- a/lnbits/extensions/paywall/crud.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from typing import List, Optional, Union
-
-from lnbits.helpers import urlsafe_short_hash
-
-from . import db
-from .models import Paywall
-
-
-async def create_paywall(
- *,
- wallet_id: str,
- url: str,
- memo: str,
- description: Optional[str] = None,
- amount: int = 0,
- remembers: bool = True,
-) -> Paywall:
- paywall_id = urlsafe_short_hash()
- await db.execute(
- """
- INSERT INTO paywall.paywalls (id, wallet, url, memo, description, amount, remembers)
- VALUES (?, ?, ?, ?, ?, ?, ?)
- """,
- (paywall_id, wallet_id, url, memo, description, amount, int(remembers)),
- )
-
- paywall = await get_paywall(paywall_id)
- assert paywall, "Newly created paywall couldn't be retrieved"
- return paywall
-
-
-async def get_paywall(paywall_id: str) -> Optional[Paywall]:
- row = await db.fetchone(
- "SELECT * FROM paywall.paywalls WHERE id = ?", (paywall_id,)
- )
-
- return Paywall.from_row(row) if row else None
-
-
-async def get_paywalls(wallet_ids: Union[str, List[str]]) -> List[Paywall]:
- if isinstance(wallet_ids, str):
- wallet_ids = [wallet_ids]
-
- q = ",".join(["?"] * len(wallet_ids))
- rows = await db.fetchall(
- f"SELECT * FROM paywall.paywalls WHERE wallet IN ({q})", (*wallet_ids,)
- )
-
- return [Paywall.from_row(row) for row in rows]
-
-
-async def delete_paywall(paywall_id: str) -> None:
- await db.execute("DELETE FROM paywall.paywalls WHERE id = ?", (paywall_id,))
diff --git a/lnbits/extensions/paywall/migrations.py b/lnbits/extensions/paywall/migrations.py
deleted file mode 100644
index 8afe58b1..00000000
--- a/lnbits/extensions/paywall/migrations.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from sqlalchemy.exc import OperationalError # type: ignore
-
-
-async def m001_initial(db):
- """
- Initial paywalls table.
- """
- await db.execute(
- """
- CREATE TABLE paywall.paywalls (
- id TEXT PRIMARY KEY,
- wallet TEXT NOT NULL,
- secret TEXT NOT NULL,
- url TEXT NOT NULL,
- memo TEXT NOT NULL,
- amount INTEGER NOT NULL,
- time TIMESTAMP NOT NULL DEFAULT """
- + db.timestamp_now
- + """
- );
- """
- )
-
-
-async def m002_redux(db):
- """
- Creates an improved paywalls table and migrates the existing data.
- """
- await db.execute("ALTER TABLE paywall.paywalls RENAME TO paywalls_old")
- await db.execute(
- """
- CREATE TABLE paywall.paywalls (
- id TEXT PRIMARY KEY,
- wallet TEXT NOT NULL,
- url TEXT NOT NULL,
- memo TEXT NOT NULL,
- description TEXT NULL,
- amount INTEGER DEFAULT 0,
- time TIMESTAMP NOT NULL DEFAULT """
- + db.timestamp_now
- + """,
- remembers INTEGER DEFAULT 0,
- extras TEXT NULL
- );
- """
- )
-
- for row in [
- list(row) for row in await db.fetchall("SELECT * FROM paywall.paywalls_old")
- ]:
- await db.execute(
- """
- INSERT INTO paywall.paywalls (
- id,
- wallet,
- url,
- memo,
- amount,
- time
- )
- VALUES (?, ?, ?, ?, ?, ?)
- """,
- (row[0], row[1], row[3], row[4], row[5], row[6]),
- )
-
- await db.execute("DROP TABLE paywall.paywalls_old")
diff --git a/lnbits/extensions/paywall/models.py b/lnbits/extensions/paywall/models.py
deleted file mode 100644
index 7b64db4c..00000000
--- a/lnbits/extensions/paywall/models.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import json
-
-from sqlite3 import Row
-from pydantic import BaseModel
-from typing import Optional
-
-
-class Paywall(BaseModel):
- id: str
- wallet: str
- url: str
- memo: str
- description: str
- amount: int
- time: int
- remembers: bool
- extras: Optional[dict]
-
- @classmethod
- def from_row(cls, row: Row) -> "Paywall":
- data = dict(row)
- data["remembers"] = bool(data["remembers"])
- data["extras"] = json.loads(data["extras"]) if data["extras"] else None
- return cls(**data)
diff --git a/lnbits/extensions/paywall/templates/paywall/_api_docs.html b/lnbits/extensions/paywall/templates/paywall/_api_docs.html
deleted file mode 100644
index 1157fa46..00000000
--- a/lnbits/extensions/paywall/templates/paywall/_api_docs.html
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
- - Access this lnbits instance at the following url -
-
-
-
-
-
-
-
-
-
-
-
-
-Ngrok extension
-- Note that if you restart your device, your device will generate a - new url. If anyone is using your old one for wallets, lnurls, - etc., whatever they are doing will stop working. -
- Created by - Supertestnet. -GET /paywall/api/v1/paywalls
- Headers
-{"X-Api-Key": <invoice_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-[<paywall_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/paywalls -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- POST /paywall/api/v1/paywalls
- Headers
-{"X-Api-Key": <admin_key>}-
Body (application/json)
-{"amount": <integer>, "description": <string>, "memo":
- <string>, "remembers": <boolean>, "url":
- <string>}
- - Returns 201 CREATED (application/json) -
-{"amount": <integer>, "description": <string>, "id":
- <string>, "memo": <string>, "remembers": <boolean>,
- "time": <int>, "url": <string>, "wallet":
- <string>}
- Curl example
-curl -X POST {{ request.url_root }}api/v1/paywalls -d '{"url":
- <string>, "memo": <string>, "description": <string>,
- "amount": <integer>, "remembers": <boolean>}' -H
- "Content-type: application/json" -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
-
- POST
- /paywall/api/v1/paywalls/<paywall_id>/invoice
- Body (application/json)
-{"amount": <integer>}
- - Returns 201 CREATED (application/json) -
-{"payment_hash": <string>, "payment_request":
- <string>}
- Curl example
-curl -X POST {{ request.url_root
- }}api/v1/paywalls/<paywall_id>/invoice -d '{"amount":
- <integer>}' -H "Content-type: application/json"
-
- POST
- /paywall/api/v1/paywalls/<paywall_id>/check_invoice
- Body (application/json)
-{"payment_hash": <string>}
- - Returns 200 OK (application/json) -
-{"paid": false}-
{"paid": true, "url": <string>, "remembers":
- <boolean>}
- Curl example
-curl -X POST {{ request.url_root
- }}api/v1/paywalls/<paywall_id>/check_invoice -d
- '{"payment_hash": <string>}' -H "Content-type: application/json"
-
- DELETE
- /paywall/api/v1/paywalls/<paywall_id>
- Headers
-{"X-Api-Key": <admin_key>}-
Returns 204 NO CONTENT
-Curl example
-curl -X DELETE {{ request.url_root
- }}api/v1/paywalls/<paywall_id> -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
-
-
-
-{% endblock %} {% block scripts %}
-
-{% endblock %}
diff --git a/lnbits/extensions/paywall/templates/paywall/index.html b/lnbits/extensions/paywall/templates/paywall/index.html
deleted file mode 100644
index 8be3b2fa..00000000
--- a/lnbits/extensions/paywall/templates/paywall/index.html
+++ /dev/null
@@ -1,312 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-
-
-
-
-
-
-{{ paywall.memo }}
- {% if paywall.description %} -{{ paywall.description }}
- {% endif %} -
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copy invoice
- Cancel
-
-
-
-
- You can access the URL behind this paywall:
- {% raw %}{{ redirectUrl }}{% endraw %}
-
- Open URL
-
-
-
-
-
-
-
-
-
-
-
-
- Remember payments
- A succesful payment will be registered in the browser's
- storage, so the user doesn't need to pay again to access the
- URL.
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/paywall/views.py b/lnbits/extensions/paywall/views.py
deleted file mode 100644
index f2dee6af..00000000
--- a/lnbits/extensions/paywall/views.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from quart import g, abort, render_template
-from http import HTTPStatus
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import paywall_ext
-from .crud import get_paywall
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@paywall_ext.route("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("paywall/index.html", {"request": request,"user":g.user})
-
-
-@paywall_ext.route("/
-
-
- New paywall
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
- Paywalls
-
- Export to CSV
-
-
-
-
-
-
- {% include "paywall/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} paywall extension -
-
- Create paywall
- Cancel
-
-
- SatsPayServer, create Onchain/LN charges.
WARNING: If using with the
- WatchOnly extension, we highly reccomend using a fresh extended public Key
- specifically for SatsPayServer!
-
- Created by, Ben Arc
-
POST /satspay/api/v1/charge
- Headers
-{"X-Api-Key": <admin_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<charge_object>, ...]
- Curl example
-curl -X POST {{ request.url_root }}api/v1/charge -d
- '{"onchainwallet": <string, watchonly_wallet_id>,
- "description": <string>, "webhook":<string>, "time":
- <integer>, "amount": <integer>, "lnbitswallet":
- <string, lnbits_wallet_id>}' -H "Content-type:
- application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
-
- PUT
- /satspay/api/v1/charge/<charge_id>
- Headers
-{"X-Api-Key": <admin_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<charge_object>, ...]
- Curl example
-curl -X POST {{ request.url_root }}api/v1/charge/<charge_id>
- -d '{"onchainwallet": <string, watchonly_wallet_id>,
- "description": <string>, "webhook":<string>, "time":
- <integer>, "amount": <integer>, "lnbitswallet":
- <string, lnbits_wallet_id>}' -H "Content-type:
- application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
-
- GET
- /satspay/api/v1/charge/<charge_id>
- Headers
-{"X-Api-Key": <invoice_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<charge_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/charge/<charge_id>
- -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- GET /satspay/api/v1/charges
- Headers
-{"X-Api-Key": <invoice_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<charge_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/charges -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- DELETE
- /satspay/api/v1/charge/<charge_id>
- Headers
-{"X-Api-Key": <admin_key>}-
Returns 204 NO CONTENT
-Curl example
-curl -X DELETE {{ request.url_root
- }}api/v1/charge/<charge_id> -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
-
- GET
- /satspay/api/v1/charges/balance/<charge_id>
- - Body (application/json) -
-- Returns 200 OK (application/json) -
-[<charge_object>, ...]
- Curl example
-curl -X GET {{ request.url_root
- }}api/v1/charges/balance/<charge_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %}
-
-
-
-{% endblock %}
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
deleted file mode 100644
index f3566c7c..00000000
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ /dev/null
@@ -1,555 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-
-
-
-
- {{ charge.description }}
-
-
-
- Time elapsed
-
-
- Charge paid
-
-
-
-
-
-
-
-
-
-
-
- Charge ID: {{ charge.id }}
-
- {% raw %} Total to pay: {{ charge_amount }}sats
- Amount paid: {{ charge_balance }}
- Amount due: {{ charge_amount - charge_balance }}sats {% endraw %} - -
- - Amount paid: {{ charge_balance }}
- Amount due: {{ charge_amount - charge_balance }}sats {% endraw %} - -
-
-
-
-
-
-
- bitcoin onchain payment method not available
-
-
-
- pay with lightning
-
-
-
-
-
- bitcoin lightning payment method not available
-
-
-
- pay onchain
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-
-
-{% endblock %}
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
deleted file mode 100644
index 20468502..00000000
--- a/lnbits/extensions/satspay/views.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from quart import g, abort, render_template, jsonify
-from http import HTTPStatus
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import satspay_ext
-from .crud import get_charge
-
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@satspay_ext.route("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("satspay/index.html", {"request":request, "user":g.user})
-
-
-@satspay_ext.route("/
-
-
- {% raw %}
- New charge
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Payment link
-
-
-
-
- Time elapsed
-
-
-
- PAID!
-
-
-
- Processing
-
-
- Delete charge
-
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
-
- Charges
-
-
-
-
- Export to CSV
-
- {{ col.label }}
- {{ col.value }}
-
-
-
-
-
- {% include "satspay/_api_docs.html" %}
-
-
-
- - {{SITE_TITLE}} satspay Extension -
-
-
-
-
-
-
-
-
-
-
- Watch-Only extension MUST be activated and have a wallet
-
-
-
-
-
-
-
-
-
-
-
- Create Charge
- Cancel
-
- - Add some wallets to the list of "Target Wallets", each with an - associated percent. After saving, every time any payment - arrives at the "Source Wallet" that payment will be split with the - target wallets according to their percent. -
-This is valid for every payment, doesn't matter how it was created.
-Target wallets can be any wallet from this same LNbits instance.
-- To remove a wallet from the targets list, just erase its fields and - save. To remove all, click "Clear" then save. -
-GET
- /splitpayments/api/v1/targets
- Headers
-{"X-Api-Key": <admin_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-[{"wallet": <wallet id>, "alias": <chosen name for this
- wallet>, "percent": <number between 1 and 100>}, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/livestream -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- PUT
- /splitpayments/api/v1/targets
- Headers
-{"X-Api-Key": <admin_key>}-
Body (application/json)
-- Returns 200 OK (application/json) -
-Curl example
-curl -X PUT {{ request.url_root }}api/v1/splitpayments/targets -H
- "X-Api-Key: {{ g.user.wallets[0].adminkey }}" -H 'Content-Type:
- application/json' -d '{"targets": [{"wallet": <wallet id or invoice
- key>, "alias": <name to identify this>, "percent": <number
- between 1 and 100>}, ...]}'
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/splitpayments/views.py b/lnbits/extensions/splitpayments/views.py
deleted file mode 100644
index 70d4ecb2..00000000
--- a/lnbits/extensions/splitpayments/views.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from quart import g, render_template
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import splitpayments_ext
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@splitpayments_ext.get("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("splitpayments/index.html", {"request":request, "user":g.user})
diff --git a/lnbits/extensions/splitpayments/views_api.py b/lnbits/extensions/splitpayments/views_api.py
deleted file mode 100644
index 76e2b729..00000000
--- a/lnbits/extensions/splitpayments/views_api.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from typing import List, Optional
-from pydantic import BaseModel
-from quart import g, jsonify
-from http import HTTPStatus
-
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-from lnbits.core.crud import get_wallet, get_wallet_for_key
-
-from . import splitpayments_ext
-from .crud import get_targets, set_targets
-from .models import Target
-
-
-@splitpayments_ext.get("/api/v1/targets")
-@api_check_wallet_key("admin")
-async def api_targets_get():
- targets = await get_targets(g.wallet.id)
- return [target._asdict() for target in targets] or []
-
-class SchemaData(BaseModel):
- wallet: str
- alias: str
- percent: int
-
-@splitpayments_ext.put("/api/v1/targets")
-@api_check_wallet_key("admin")
-async def api_targets_set(targets: Optional[List[SchemaData]]
- = None):
- targets = []
-
- for entry in targets:
- wallet = await get_wallet(entry["wallet"])
- if not wallet:
- wallet = await get_wallet_for_key(entry["wallet"], "invoice")
- if not wallet:
- return (
- {"message": f"Invalid wallet '{entry['wallet']}'."},
- HTTPStatus.BAD_REQUEST,
- )
-
- if wallet.id == g.wallet.id:
- return (
- {"message": "Can't split to itself."},
- HTTPStatus.BAD_REQUEST,
- )
-
- if entry["percent"] < 0:
- return (
- {"message": f"Invalid percent '{entry['percent']}'."},
- HTTPStatus.BAD_REQUEST,
- )
-
- targets.append(
- Target(wallet.id, g.wallet.id, entry["percent"], entry["alias"] or "")
- )
-
- percent_sum = sum([target.percent for target in targets])
- if percent_sum > 100:
- return {"message": "Splitting over 100%."}, HTTPStatus.BAD_REQUEST
-
- await set_targets(g.wallet.id, targets)
- return "", HTTPStatus.OK
diff --git a/lnbits/extensions/streamalerts/README.md b/lnbits/extensions/streamalerts/README.md
deleted file mode 100644
index 726ffe76..00000000
--- a/lnbits/extensions/streamalerts/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Clear
-
-
-
-
-
- Save Targets
-
-
-
-
-
-
-
-
-
-
-
- Target Wallets
-
-
-
-
-
-
-
-
- {% include "splitpayments/_api_docs.html" %}
-
-
-
-- {{SITE_TITLE}} SplitPayments extension -
-Stream Alerts
-Integrate Bitcoin Donations into your livestream alerts
-The StreamAlerts extension allows you to integrate Bitcoin Lightning (and on-chain) paymnents in to your existing Streamlabs alerts! - - - -How to set it up
- -At the moment, the only service that has an open API to work with is Streamlabs, so this setup requires linking your Twitch/YouTube/Facebook account to Streamlabs. - -1. Log into [Streamlabs](https://streamlabs.com/login?r=https://streamlabs.com/dashboard). -1. Navigate to the API settings page to register an App: - - - -1. Fill out the form with anything it will accept as valid. Most fields can be gibberish, as the application is not supposed to ever move past the "testing" stage and is for your personal use only. -In the "Whitelist Users" field, input the username of a Twitch account you control. While this feature is *technically* limited to Twitch, you can use the alerts overlay for donations on YouTube and Facebook as well. -For now, simply set the "Redirect URI" to `http://localhost`, you will change this soon. -Then, hit create: - -1. In LNbits, enable the Stream Alerts extension and optionally the SatsPayServer (to observe donations directly) and Watch Only (to accept on-chain donations) extenions: - -1. Create a "NEW SERVICE" using the button. Fill in all the information (you get your Client ID and Secret from the Streamlabs App page): - - -1. Right-click and copy the "Redirect URI for Streamlabs" link (you might have to refresh the page for the text to turn into a link) and input it into the "Redirect URI" field for your Streamelements App, and hit "Save Settings": - - -1. You can now authenticate your app on LNbits by clicking on this button and following the instructions. Make sure to log in with the Twitch account you entered in the "Whitelist Users" field: - - -If everything worked correctly, you should now be redirected back to LNbits. When scrolling all the way right, you should now see that the service has been authenticated: - -You can now share the link to your donations page, which you can get here: - - -Of course, this has to be available publicly on the internet (or, depending on your viewers' technical ability, over Tor). -When your viewers donate to you, these donations will now show up in your Streamlabs donation feed, as well as your alerts overlay (if it is configured to include donations). -CONGRATS! Let the sats flow!
diff --git a/lnbits/extensions/streamalerts/__init__.py b/lnbits/extensions/streamalerts/__init__.py deleted file mode 100644 index 72f0ae7c..00000000 --- a/lnbits/extensions/streamalerts/__init__.py +++ /dev/null @@ -1,11 +0,0 @@ -from quart import Blueprint -from lnbits.db import Database - -db = Database("ext_streamalerts") - -streamalerts_ext: Blueprint = Blueprint( - "streamalerts", __name__, static_folder="static", template_folder="templates" -) - -from .views_api import * # noqa -from .views import * # noqa diff --git a/lnbits/extensions/streamalerts/config.json b/lnbits/extensions/streamalerts/config.json deleted file mode 100644 index 2fbcc55e..00000000 --- a/lnbits/extensions/streamalerts/config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Stream Alerts", - "short_description": "Integrate Bitcoin donations into your stream alerts!", - "icon": "notifications_active", - "contributors": ["Fittiboy"] -} diff --git a/lnbits/extensions/streamalerts/crud.py b/lnbits/extensions/streamalerts/crud.py deleted file mode 100644 index cbd9d3b0..00000000 --- a/lnbits/extensions/streamalerts/crud.py +++ /dev/null @@ -1,297 +0,0 @@ -from . import db -from .models import Donation, Service - -from ..satspay.crud import delete_charge # type: ignore - -import httpx - -from http import HTTPStatus -from quart import jsonify - -from typing import Optional - -from lnbits.db import SQLITE -from lnbits.helpers import urlsafe_short_hash -from lnbits.core.crud import get_wallet - - -async def get_service_redirect_uri(request, service_id): - """Return the service's redirect URI, to be given to the third party API""" - uri_base = request.scheme + "://" - uri_base += request.headers["Host"] + "/streamalerts/api/v1" - redirect_uri = uri_base + f"/authenticate/{service_id}" - return redirect_uri - - -async def get_charge_details(service_id): - """Return the default details for a satspay charge - - These might be different depending for services implemented in the future. - """ - details = { - "time": 1440, - } - service = await get_service(service_id) - wallet_id = service.wallet - wallet = await get_wallet(wallet_id) - user = wallet.user - details["user"] = user - details["lnbitswallet"] = wallet_id - details["onchainwallet"] = service.onchain - return details - - -async def create_donation( - id: str, - wallet: str, - cur_code: str, - sats: int, - amount: float, - service: int, - name: str = "Anonymous", - message: str = "", - posted: bool = False, -) -> Donation: - """Create a new Donation""" - await db.execute( - """ - INSERT INTO streamalerts.Donations ( - id, - wallet, - name, - message, - cur_code, - sats, - amount, - service, - posted - ) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) - """, - (id, wallet, name, message, cur_code, sats, amount, service, posted), - ) - - donation = await get_donation(id) - assert donation, "Newly created donation couldn't be retrieved" - return donation - - -async def post_donation(donation_id: str) -> tuple: - """Post donations to their respective third party APIs - - If the donation has already been posted, it will not be posted again. - """ - donation = await get_donation(donation_id) - if not donation: - return (jsonify({"message": "Donation not found!"}), HTTPStatus.BAD_REQUEST) - if donation.posted: - return ( - jsonify({"message": "Donation has already been posted!"}), - HTTPStatus.BAD_REQUEST, - ) - service = await get_service(donation.service) - assert service, "Couldn't fetch service to donate to" - - if service.servicename == "Streamlabs": - url = "https://streamlabs.com/api/v1.0/donations" - data = { - "name": donation.name[:25], - "message": donation.message[:255], - "identifier": "LNbits", - "amount": donation.amount, - "currency": donation.cur_code.upper(), - "access_token": service.token, - } - async with httpx.AsyncClient() as client: - response = await client.post(url, data=data) - print(response.json()) - status = [s for s in list(HTTPStatus) if s == response.status_code][0] - elif service.servicename == "StreamElements": - return ( - jsonify({"message": "StreamElements not yet supported!"}), - HTTPStatus.BAD_REQUEST, - ) - else: - return (jsonify({"message": "Unsopported servicename"}), HTTPStatus.BAD_REQUEST) - await db.execute( - "UPDATE streamalerts.Donations SET posted = 1 WHERE id = ?", (donation_id,) - ) - return (jsonify(response.json()), status) - - -async def create_service( - twitchuser: str, - client_id: str, - client_secret: str, - wallet: str, - servicename: str, - state: str = None, - onchain: str = None, -) -> Service: - """Create a new Service""" - - returning = "" if db.type == SQLITE else "RETURNING ID" - method = db.execute if db.type == SQLITE else db.fetchone - - result = await (method)( - f""" - INSERT INTO streamalerts.Services ( - twitchuser, - client_id, - client_secret, - wallet, - servicename, - authenticated, - state, - onchain - ) - VALUES (?, ?, ?, ?, ?, ?, ?, ?) - {returning} - """, - ( - twitchuser, - client_id, - client_secret, - wallet, - servicename, - False, - urlsafe_short_hash(), - onchain, - ), - ) - if db.type == SQLITE: - service_id = result._result_proxy.lastrowid - else: - service_id = result[0] - - service = await get_service(service_id) - assert service - return service - - -async def get_service(service_id: int, by_state: str = None) -> Optional[Service]: - """Return a service either by ID or, available, by state - - Each Service's donation page is reached through its "state" hash - instead of the ID, preventing accidental payments to the wrong - streamer via typos like 2 -> 3. - """ - if by_state: - row = await db.fetchone( - "SELECT * FROM streamalerts.Services WHERE state = ?", (by_state,) - ) - else: - row = await db.fetchone( - "SELECT * FROM streamalerts.Services WHERE id = ?", (service_id,) - ) - return Service.from_row(row) if row else None - - -async def get_services(wallet_id: str) -> Optional[list]: - """Return all services belonging assigned to the wallet_id""" - rows = await db.fetchall( - "SELECT * FROM streamalerts.Services WHERE wallet = ?", (wallet_id,) - ) - return [Service.from_row(row) for row in rows] if rows else None - - -async def authenticate_service(service_id, code, redirect_uri): - """Use authentication code from third party API to retreive access token""" - # The API token is passed in the querystring as 'code' - service = await get_service(service_id) - wallet = await get_wallet(service.wallet) - user = wallet.user - url = "https://streamlabs.com/api/v1.0/token" - data = { - "grant_type": "authorization_code", - "code": code, - "client_id": service.client_id, - "client_secret": service.client_secret, - "redirect_uri": redirect_uri, - } - print(data) - async with httpx.AsyncClient() as client: - response = (await client.post(url, data=data)).json() - print(response) - token = response["access_token"] - success = await service_add_token(service_id, token) - return f"/streamalerts/?usr={user}", success - - -async def service_add_token(service_id, token): - """Add access token to its corresponding Service - - This also sets authenticated = 1 to make sure the token - is not overwritten. - Tokens for Streamlabs never need to be refreshed. - """ - if (await get_service(service_id)).authenticated: - return False - await db.execute( - "UPDATE streamalerts.Services SET authenticated = 1, token = ? where id = ?", - ( - token, - service_id, - ), - ) - return True - - -async def delete_service(service_id: int) -> None: - """Delete a Service and all corresponding Donations""" - await db.execute("DELETE FROM streamalerts.Services WHERE id = ?", (service_id,)) - rows = await db.fetchall( - "SELECT * FROM streamalerts.Donations WHERE service = ?", (service_id,) - ) - for row in rows: - await delete_donation(row["id"]) - - -async def get_donation(donation_id: str) -> Optional[Donation]: - """Return a Donation""" - row = await db.fetchone( - "SELECT * FROM streamalerts.Donations WHERE id = ?", (donation_id,) - ) - return Donation.from_row(row) if row else None - - -async def get_donations(wallet_id: str) -> Optional[list]: - """Return all streamalerts.Donations assigned to wallet_id""" - rows = await db.fetchall( - "SELECT * FROM streamalerts.Donations WHERE wallet = ?", (wallet_id,) - ) - return [Donation.from_row(row) for row in rows] if rows else None - - -async def delete_donation(donation_id: str) -> None: - """Delete a Donation and its corresponding statspay charge""" - await db.execute("DELETE FROM streamalerts.Donations WHERE id = ?", (donation_id,)) - await delete_charge(donation_id) - - -async def update_donation(donation_id: str, **kwargs) -> Donation: - """Update a Donation""" - q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()]) - await db.execute( - f"UPDATE streamalerts.Donations SET {q} WHERE id = ?", - (*kwargs.values(), donation_id), - ) - row = await db.fetchone( - "SELECT * FROM streamalerts.Donations WHERE id = ?", (donation_id,) - ) - assert row, "Newly updated donation couldn't be retrieved" - return Donation(**row) - - -async def update_service(service_id: str, **kwargs) -> Service: - """Update a service""" - q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()]) - await db.execute( - f"UPDATE streamalerts.Services SET {q} WHERE id = ?", - (*kwargs.values(), service_id), - ) - row = await db.fetchone( - "SELECT * FROM streamalerts.Services WHERE id = ?", (service_id,) - ) - assert row, "Newly updated service couldn't be retrieved" - return Service(**row) diff --git a/lnbits/extensions/streamalerts/migrations.py b/lnbits/extensions/streamalerts/migrations.py deleted file mode 100644 index 1b0cea37..00000000 --- a/lnbits/extensions/streamalerts/migrations.py +++ /dev/null @@ -1,35 +0,0 @@ -async def m001_initial(db): - - await db.execute( - f""" - CREATE TABLE IF NOT EXISTS streamalerts.Services ( - id {db.serial_primary_key}, - state TEXT NOT NULL, - twitchuser TEXT NOT NULL, - client_id TEXT NOT NULL, - client_secret TEXT NOT NULL, - wallet TEXT NOT NULL, - onchain TEXT, - servicename TEXT NOT NULL, - authenticated BOOLEAN NOT NULL, - token TEXT - ); - """ - ) - - await db.execute( - f""" - CREATE TABLE IF NOT EXISTS streamalerts.Donations ( - id TEXT PRIMARY KEY, - wallet TEXT NOT NULL, - name TEXT NOT NULL, - message TEXT NOT NULL, - cur_code TEXT NOT NULL, - sats INT NOT NULL, - amount FLOAT NOT NULL, - service INTEGER NOT NULL, - posted BOOLEAN NOT NULL, - FOREIGN KEY(service) REFERENCES {db.references_schema}Services(id) - ); - """ - ) diff --git a/lnbits/extensions/streamalerts/models.py b/lnbits/extensions/streamalerts/models.py deleted file mode 100644 index 81e47386..00000000 --- a/lnbits/extensions/streamalerts/models.py +++ /dev/null @@ -1,45 +0,0 @@ -from sqlite3 import Row -from pydantic import BaseModel -from typing import Optional - - -class Donation(BaseModel): - """A Donation simply contains all the necessary information about a - user's donation to a streamer - """ - - id: str # This ID always corresponds to a satspay charge ID - wallet: str - name: str # Name of the donor - message: str # Donation message - cur_code: str # Three letter currency code accepted by Streamlabs - sats: int - amount: float # The donation amount after fiat conversion - service: int # The ID of the corresponding Service - posted: bool # Whether the donation has already been posted to a Service - - @classmethod - def from_row(cls, row: Row) -> "Donation": - return cls(**dict(row)) - - -class Service(BaseModel): - """A Service represents an integration with a third-party API - - Currently, Streamlabs is the only supported Service. - """ - - id: int - state: str # A random hash used during authentication - twitchuser: str # The Twitch streamer's username - client_id: str # Third party service Client ID - client_secret: str # Secret corresponding to the Client ID - wallet: str - onchain: str - servicename: str # Currently, this will just always be "Streamlabs" - authenticated: bool # Whether a token (see below) has been acquired yet - token: Optional[int] # The token with which to authenticate requests - - @classmethod - def from_row(cls, row: Row) -> "Service": - return cls(**dict(row)) diff --git a/lnbits/extensions/streamalerts/templates/streamalerts/_api_docs.html b/lnbits/extensions/streamalerts/templates/streamalerts/_api_docs.html deleted file mode 100644 index 33b52f15..00000000 --- a/lnbits/extensions/streamalerts/templates/streamalerts/_api_docs.html +++ /dev/null @@ -1,18 +0,0 @@ -- Stream Alerts: Integrate Bitcoin into your stream alerts! -
-
- Accept Bitcoin donations on Twitch, and integrate them into your alerts.
- Present your viewers with a simple donation page, and add those donations
- to Streamlabs to play alerts on your stream!
- For detailed setup instructions, check out
- this guide!
-
- Created by, Fitti
-
-
-
-{% endblock %} {% block scripts %}
-
-{% endblock %}
diff --git a/lnbits/extensions/streamalerts/templates/streamalerts/index.html b/lnbits/extensions/streamalerts/templates/streamalerts/index.html
deleted file mode 100644
index 46d1bb31..00000000
--- a/lnbits/extensions/streamalerts/templates/streamalerts/index.html
+++ /dev/null
@@ -1,502 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-
-
-
-
-
-
-
-
-
-Donate Bitcoin to {{ twitchuser }}
--
- Submit
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/streamalerts/views.py b/lnbits/extensions/streamalerts/views.py
deleted file mode 100644
index 15a2c399..00000000
--- a/lnbits/extensions/streamalerts/views.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from quart import g, abort, render_template
-
-from lnbits.decorators import check_user_exists, validate_uuids
-from http import HTTPStatus
-
-from . import streamalerts_ext
-from .crud import get_service
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@streamalerts_ext.get("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- """Return the extension's settings page"""
- return await templates.TemplateResponse("streamalerts/index.html", {"request":request, "user":g.user})
-
-
-@streamalerts_ext.get("/
-
-
- New Service
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
- Services
-
- Export to CSV
-
-
-
-
-
- Donations
-
- Export to CSV
-
-
-
-
-
-
- {% include "streamalerts/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} Stream Alerts extension -
-
-
-
-
-
-
-
-
-
- Watch-Only extension MUST be activated and have a wallet
-
-
-
-
-
-
- Update Service
-
- Create Service
- Cancel
-
- Subdomains Extension
- -So the goal of the extension is to allow the owner of a domain to sell subdomains to anyone who is willing to pay some money for it. - -[](https://youtu.be/O1X0fy3uNpw 'video tutorial subdomains') - -## Requirements - -- Free Cloudflare account -- Cloudflare as a DNS server provider -- Cloudflare TOKEN and Cloudflare zone-ID where the domain is parked - -## Usage - -1. Register at Cloudflare and setup your domain with them. (Just follow instructions they provide...) -2. Change DNS server at your domain registrar to point to Cloudflare's -3. Get Cloudflare zone-ID for your domain -
-4. Get Cloudflare API TOKEN
- 
- 
-5. Open the LNBits subdomains extension and register your domain
-6. Click on the button in the table to open the public form that was generated for your domain
-
- - Extension also supports webhooks so you can get notified when someone buys a new subdomain\
- 
-
-## API Endpoints
-
-- **Domains**
- - GET /api/v1/domains
- - POST /api/v1/domains
- - PUT /api/v1/domains/- lnSubdomains: Get paid sats to sell your subdomains -
-
- Charge people for using your subdomain name...
-
- More details
-
-
- Created by, Kris
-
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %}
-
-{% endblock %}
diff --git a/lnbits/extensions/subdomains/templates/subdomains/index.html b/lnbits/extensions/subdomains/templates/subdomains/index.html
deleted file mode 100644
index 26b5d7a6..00000000
--- a/lnbits/extensions/subdomains/templates/subdomains/index.html
+++ /dev/null
@@ -1,550 +0,0 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ domain_domain }}
--
{{ domain_desc }}
--
- Cost per day: {{ domain_cost }} sats
- {% raw %} Total cost: {{amountSats}} sats {% endraw %}
-
- Submit
- Cancel
-
-
-
-
-
-
-
-
- Copy invoice
- Close
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/subdomains/util.py b/lnbits/extensions/subdomains/util.py
deleted file mode 100644
index c7d66307..00000000
--- a/lnbits/extensions/subdomains/util.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from lnbits.extensions.subdomains.models import Subdomains
-
-# Python3 program to validate
-# domain name
-# using regular expression
-import re
-import socket
-
-# Function to validate domain name.
-def isValidDomain(str):
- # Regex to check valid
- # domain name.
- regex = "^((?!-)[A-Za-z0-9-]{1,63}(?")
-async def display(request: Request, domain_id):
- domain = await get_domain(domain_id)
- if not domain:
- abort(HTTPStatus.NOT_FOUND, "Domain does not exist.")
- allowed_records = (
- domain.allowed_record_types.replace('"', "").replace(" ", "").split(",")
- )
- print(allowed_records)
- return await templates.TemplateResponse(
- "subdomains/display.html",
- {"request":request,
- "domain_id":domain.id,
- "domain_domain":domain.domain,
- "domain_desc":domain.description,
- "domain_cost":domain.cost,
- "domain_allowed_record_types":allowed_records}
- )
diff --git a/lnbits/extensions/subdomains/views_api.py b/lnbits/extensions/subdomains/views_api.py
deleted file mode 100644
index 72000238..00000000
--- a/lnbits/extensions/subdomains/views_api.py
+++ /dev/null
@@ -1,215 +0,0 @@
-from typing import Optional
-from fastapi.param_functions import Query
-from pydantic.main import BaseModel
-from quart import g, jsonify, request
-from http import HTTPStatus
-
-from lnbits.core.crud import get_user
-from lnbits.core.services import create_invoice, check_invoice_status
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-
-from . import subdomains_ext
-from .crud import (
- create_subdomain,
- get_subdomain,
- get_subdomains,
- delete_subdomain,
- create_domain,
- update_domain,
- get_domain,
- get_domains,
- delete_domain,
- get_subdomainBySubdomain,
-)
-from .cloudflare import cloudflare_create_subdomain, cloudflare_deletesubdomain
-
-
-# domainS
-
-
-@subdomains_ext.get("/api/v1/domains")
-@api_check_wallet_key("invoice")
-async def api_domains():
- wallet_ids = [g.wallet.id]
-
- if "all_wallets" in request.args:
- wallet_ids = (await get_user(g.wallet.user)).wallet_ids
-
- return (
- [domain._asdict() for domain in await get_domains(wallet_ids)],
- HTTPStatus.OK,
- )
-
-class CreateDomainsData(BaseModel):
- wallet: str
- domain: str
- cf_token: str
- cf_zone_id: str
- webhook: Optional[str]
- description: str
- cost: int
- allowed_record_types: str
-
-@subdomains_ext.post("/api/v1/domains")
-@subdomains_ext.put("/api/v1/domains/{domain_id}")
-@api_check_wallet_key("invoice")
-async def api_domain_create(data: CreateDomainsData, domain_id=None):
- if domain_id:
- domain = await get_domain(domain_id)
-
- if not domain:
- return {"message": "domain does not exist."}, HTTPStatus.NOT_FOUND
-
- if domain.wallet != g.wallet.id:
- return {"message": "Not your domain."}, HTTPStatus.FORBIDDEN
-
- domain = await update_domain(domain_id, **data)
- else:
- domain = await create_domain(**data)
- return domain._asdict(), HTTPStatus.CREATED
-
-
-@subdomains_ext.delete("/api/v1/domains/{domain_id}")
-@api_check_wallet_key("invoice")
-async def api_domain_delete(domain_id):
- domain = await get_domain(domain_id)
-
- if not domain:
- return {"message": "domain does not exist."}, HTTPStatus.NOT_FOUND
-
- if domain.wallet != g.wallet.id:
- return {"message": "Not your domain."}, HTTPStatus.FORBIDDEN
-
- await delete_domain(domain_id)
-
- return "", HTTPStatus.NO_CONTENT
-
-
-#########subdomains##########
-
-
-@subdomains_ext.get("/api/v1/subdomains")
-@api_check_wallet_key("invoice")
-async def api_subdomains():
- wallet_ids = [g.wallet.id]
-
- if "all_wallets" in request.args:
- wallet_ids = (await get_user(g.wallet.user)).wallet_ids
-
- return (
- [domain._asdict() for domain in await get_subdomains(wallet_ids)],
- HTTPStatus.OK,
- )
-
-class CreateDomainsData(BaseModel):
- domain: str
- subdomain: str
- email: str
- ip: str
- sats: int = Query(0, ge=0)
- duration: int
- record_type: str
-
-@subdomains_ext.post("/api/v1/subdomains/{domain_id}")
-
-async def api_subdomain_make_subdomain(data: CreateDomainsData, domain_id):
- domain = await get_domain(domain_id)
-
- # If the request is coming for the non-existant domain
- if not domain:
- return {"message": "LNsubdomain does not exist."}, HTTPStatus.NOT_FOUND
-
- ## If record_type is not one of the allowed ones reject the request
- if data.record_type not in domain.allowed_record_types:
- return ({"message": data.record_type + "Not a valid record"},
- HTTPStatus.BAD_REQUEST,
- )
-
- ## If domain already exist in our database reject it
- if await get_subdomainBySubdomain(data.subdomain) is not None:
- return (
- {
- "message": data.subdomain
- + "."
- + domain.domain
- + " domain already taken"
- },
- HTTPStatus.BAD_REQUEST,
- )
-
- ## Dry run cloudflare... (create and if create is sucessful delete it)
- cf_response = await cloudflare_create_subdomain(
- domain=domain,
- subdomain=data.subdomain,
- record_type=data.record_type,
- ip=data.ip,
- )
- if cf_response["success"] == True:
- cloudflare_deletesubdomain(domain=domain, domain_id=cf_response["result"]["id"])
- else:
- return (
- {
- "message": "Problem with cloudflare: "
- + cf_response["errors"][0]["message"]
- },
- HTTPStatus.BAD_REQUEST,
- )
-
- ## ALL OK - create an invoice and return it to the user
- sats = data.sats
-
- try:
- payment_hash, payment_request = await create_invoice(
- wallet_id=domain.wallet,
- amount=sats,
- memo=f"subdomain {data.subdomain}.{domain.domain} for {sats} sats for {data.duration} days",
- extra={"tag": "lnsubdomain"},
- )
- except Exception as e:
- return {"message": str(e)}, HTTPStatus.INTERNAL_SERVER_ERROR
-
- subdomain = await create_subdomain(
- payment_hash=payment_hash, wallet=domain.wallet, **data
- )
-
- if not subdomain:
- return (
- {"message": "LNsubdomain could not be fetched."},
- HTTPStatus.NOT_FOUND,
- )
-
- return (
- {"payment_hash": payment_hash, "payment_request": payment_request},
- HTTPStatus.OK,
- )
-
-
-@subdomains_ext.get("/api/v1/subdomains/{payment_hash}")
-async def api_subdomain_send_subdomain(payment_hash):
- subdomain = await get_subdomain(payment_hash)
- try:
- status = await check_invoice_status(subdomain.wallet, payment_hash)
- is_paid = not status.pending
- except Exception:
- return {"paid": False}, HTTPStatus.OK
-
- if is_paid:
- return {"paid": True}, HTTPStatus.OK
-
- return {"paid": False}, HTTPStatus.OK
-
-
-@subdomains_ext.delete("/api/v1/subdomains/{subdomain_id}")
-@api_check_wallet_key("invoice")
-async def api_subdomain_delete(subdomain_id):
- subdomain = await get_subdomain(subdomain_id)
-
- if not subdomain:
- return {"message": "Paywall does not exist."}, HTTPStatus.NOT_FOUND
-
- if subdomain.wallet != g.wallet.id:
- return {"message": "Not your subdomain."}, HTTPStatus.FORBIDDEN
-
- await delete_subdomain(subdomain_id)
-
- return "", HTTPStatus.NO_CONTENT
diff --git a/lnbits/extensions/tpos/__init__.py b/lnbits/extensions/tpos/__init__.py
index daa3022e..ea7a0504 100644
--- a/lnbits/extensions/tpos/__init__.py
+++ b/lnbits/extensions/tpos/__init__.py
@@ -1,12 +1,26 @@
-from quart import Blueprint
+import asyncio
+
+from fastapi import APIRouter
+
from lnbits.db import Database
+from lnbits.helpers import template_renderer
+from lnbits.tasks import catch_everything_and_restart
db = Database("ext_tpos")
-tpos_ext: Blueprint = Blueprint(
- "tpos", __name__, static_folder="static", template_folder="templates"
+tpos_ext: APIRouter = APIRouter(
+ prefix="/tpos",
+ tags=["TPoS"]
+ # "tpos", __name__, static_folder="static", template_folder="templates"
)
+def tpos_renderer():
+ return template_renderer(
+ [
+ "lnbits/extensions/tpos/templates",
+ ]
+ )
+
from .views_api import * # noqa
from .views import * # noqa
diff --git a/lnbits/extensions/tpos/crud.py b/lnbits/extensions/tpos/crud.py
index 99dab662..25a65904 100644
--- a/lnbits/extensions/tpos/crud.py
+++ b/lnbits/extensions/tpos/crud.py
@@ -3,17 +3,17 @@ from typing import List, Optional, Union
from lnbits.helpers import urlsafe_short_hash
from . import db
-from .models import TPoS
+from .models import TPoS, CreateTposData
-async def create_tpos(*, wallet_id: str, name: str, currency: str) -> TPoS:
+async def create_tpos(wallet_id: str, data: CreateTposData) -> TPoS:
tpos_id = urlsafe_short_hash()
await db.execute(
"""
INSERT INTO tpos.tposs (id, wallet, name, currency)
VALUES (?, ?, ?, ?)
""",
- (tpos_id, wallet_id, name, currency),
+ (tpos_id, wallet_id, data.name, data.currency),
)
tpos = await get_tpos(tpos_id)
diff --git a/lnbits/extensions/tpos/models.py b/lnbits/extensions/tpos/models.py
index 3400924a..a474a05d 100644
--- a/lnbits/extensions/tpos/models.py
+++ b/lnbits/extensions/tpos/models.py
@@ -1,8 +1,12 @@
from sqlite3 import Row
+from fastapi.param_functions import Query
from pydantic import BaseModel
-#from typing import NamedTuple
+class CreateTposData(BaseModel):
+ name: str
+ currency: str
+
class TPoS(BaseModel):
id: str
wallet: str
diff --git a/lnbits/extensions/tpos/templates/tpos/index.html b/lnbits/extensions/tpos/templates/tpos/index.html
index f3b55b37..b7e6daa1 100644
--- a/lnbits/extensions/tpos/templates/tpos/index.html
+++ b/lnbits/extensions/tpos/templates/tpos/index.html
@@ -354,7 +354,7 @@
LNbits.api
.request(
'GET',
- '/tpos/api/v1/tposs?all_wallets',
+ '/tpos/api/v1/tposs?all_wallets=true',
this.g.user.wallets[0].inkey
)
.then(function (response) {
diff --git a/lnbits/extensions/tpos/templates/tpos/tpos.html b/lnbits/extensions/tpos/templates/tpos/tpos.html
index 1727e6e9..429c763d 100644
--- a/lnbits/extensions/tpos/templates/tpos/tpos.html
+++ b/lnbits/extensions/tpos/templates/tpos/tpos.html
@@ -188,6 +188,7 @@
return Math.ceil((this.amount / this.exchangeRate) * 100000000)
},
fsat: function () {
+ console.log('sat', this.sat, LNbits.utils.formatSat(this.sat))
return LNbits.utils.formatSat(this.sat)
}
},
@@ -203,10 +204,12 @@
showInvoice: function () {
var self = this
var dialog = this.invoiceDialog
-
+ console.log(this.sat, this.tposId)
axios
- .post('/tpos/api/v1/tposs/' + this.tposId + '/invoices/', {
- amount: this.sat
+ .post('/tpos/api/v1/tposs/' + this.tposId + '/invoices', null, {
+ params: {
+ amount: this.sat
+ }
})
.then(function (response) {
dialog.data = response.data
diff --git a/lnbits/extensions/tpos/views.py b/lnbits/extensions/tpos/views.py
index 278546bb..1c7fedcd 100644
--- a/lnbits/extensions/tpos/views.py
+++ b/lnbits/extensions/tpos/views.py
@@ -1,26 +1,33 @@
-from quart import g, abort, render_template
+from starlette.exceptions import HTTPException
+from starlette.responses import HTMLResponse
+from lnbits.core.models import User
+from lnbits.core.crud import get_wallet
+from lnbits.decorators import check_user_exists
from http import HTTPStatus
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import tpos_ext
+from . import tpos_ext, tpos_renderer
from .crud import get_tpos
from fastapi import FastAPI, Request
+from fastapi.params import Depends
from fastapi.templating import Jinja2Templates
templates = Jinja2Templates(directory="templates")
-@tpos_ext.get("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("tpos/index.html", {"request":request,"user":g.user})
+@tpos_ext.get("/", response_class=HTMLResponse)
+# @validate_uuids(["usr"], required=True)
+# @check_user_exists()
+async def index(request: Request, user: User = Depends(check_user_exists)):
+ return tpos_renderer().TemplateResponse("tpos/index.html", {"request": request,"user": user.dict()})
@tpos_ext.get("/{tpos_id}")
async def tpos(request: Request, tpos_id):
tpos = await get_tpos(tpos_id)
if not tpos:
- abort(HTTPStatus.NOT_FOUND, "TPoS does not exist.")
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="TPoS does not exist."
+ )
+ # abort(HTTPStatus.NOT_FOUND, "TPoS does not exist.")
- return await templates.TemplateResponse("tpos/tpos.html", {"request":request,"tpos":tpos})
+ return tpos_renderer().TemplateResponse("tpos/tpos.html", {"request": request, "tpos": tpos})
diff --git a/lnbits/extensions/tpos/views_api.py b/lnbits/extensions/tpos/views_api.py
index 3b95491d..b73dc83e 100644
--- a/lnbits/extensions/tpos/views_api.py
+++ b/lnbits/extensions/tpos/views_api.py
@@ -1,74 +1,72 @@
-from quart import g, jsonify, request
from http import HTTPStatus
-from fastapi import FastAPI, Query
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import JSONResponse
+from fastapi import Query
+from fastapi.params import Depends
+
from pydantic import BaseModel
+from starlette.exceptions import HTTPException
+from starlette.requests import Request
+from starlette.responses import HTMLResponse, JSONResponse # type: ignore
from lnbits.core.crud import get_user, get_wallet
from lnbits.core.services import create_invoice, check_invoice_status
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+from lnbits.decorators import WalletTypeInfo, get_key_type
from . import tpos_ext
from .crud import create_tpos, get_tpos, get_tposs, delete_tpos
-from .models import TPoS
+from .models import TPoS, CreateTposData
-@tpos_ext.get("/api/v1/tposs")
-@api_check_wallet_key("invoice")
-async def api_tposs(all_wallets: bool = Query(None)):
- wallet_ids = [g.wallet.id]
+@tpos_ext.get("/api/v1/tposs", status_code=HTTPStatus.OK)
+async def api_tposs(
+ all_wallets: bool = Query(None),
+ wallet: WalletTypeInfo = Depends(get_key_type)
+ ):
+ wallet_ids = [wallet.wallet.id]
if all_wallets:
- wallet_ids = wallet_ids = (await get_user(g.wallet.user)).wallet_ids(await get_user(g.wallet.user)).wallet_ids
- # if "all_wallets" in request.args:
- # wallet_ids = (await get_user(g.wallet.user)).wallet_ids
+ wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
- return [tpos._asdict() for tpos in await get_tposs(wallet_ids)], HTTPStatus.OK
+ return [tpos.dict() for tpos in await get_tposs(wallet_ids)]
-class CreateData(BaseModel):
- name: str
- currency: str
-
-@tpos_ext.post("/api/v1/tposs")
-@api_check_wallet_key("invoice")
-# @api_validate_post_request(
-# schema={
-# "name": {"type": "string", "empty": False, "required": True},
-# "currency": {"type": "string", "empty": False, "required": True},
-# }
-# )
-async def api_tpos_create(data: CreateData):
- tpos = await create_tpos(wallet_id=g.wallet.id, **data)
- return tpos._asdict(), HTTPStatus.CREATED
+@tpos_ext.post("/api/v1/tposs", status_code=HTTPStatus.CREATED)
+async def api_tpos_create(data: CreateTposData, wallet: WalletTypeInfo = Depends(get_key_type)):
+ tpos = await create_tpos(wallet_id=wallet.wallet.id, data=data)
+ return tpos.dict()
@tpos_ext.delete("/api/v1/tposs/{tpos_id}")
-@api_check_wallet_key("admin")
-async def api_tpos_delete(tpos_id: str):
+async def api_tpos_delete(tpos_id: str, wallet: WalletTypeInfo = Depends(get_key_type)):
tpos = await get_tpos(tpos_id)
if not tpos:
- return {"message": "TPoS does not exist."}, HTTPStatus.NOT_FOUND
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="TPoS does not exist."
+ )
+ # return {"message": "TPoS does not exist."}, HTTPStatus.NOT_FOUND
- if tpos.wallet != g.wallet.id:
- return {"message": "Not your TPoS."}, HTTPStatus.FORBIDDEN
+ if tpos.wallet != wallet.wallet.id:
+ raise HTTPException(
+ status_code=HTTPStatus.FORBIDDEN,
+ detail="Not your TPoS."
+ )
+ # return {"message": "Not your TPoS."}, HTTPStatus.FORBIDDEN
await delete_tpos(tpos_id)
+ raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+ # return "", HTTPStatus.NO_CONTENT
- return "", HTTPStatus.NO_CONTENT
-
-
-@tpos_ext.post("/api/v1/tposs/{tpos_id}/invoices/")
-# @api_validate_post_request(
-# schema={"amount": {"type": "integer", "min": 1, "required": True}}
-# )
+@tpos_ext.post("/api/v1/tposs/{tpos_id}/invoices", status_code=HTTPStatus.CREATED)
async def api_tpos_create_invoice(amount: int = Query(..., ge=1), tpos_id: str = None):
tpos = await get_tpos(tpos_id)
if not tpos:
- return {"message": "TPoS does not exist."}, HTTPStatus.NOT_FOUND
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="TPoS does not exist."
+ )
+ # return {"message": "TPoS does not exist."}, HTTPStatus.NOT_FOUND
try:
payment_hash, payment_request = await create_invoice(
@@ -78,30 +76,37 @@ async def api_tpos_create_invoice(amount: int = Query(..., ge=1), tpos_id: str =
extra={"tag": "tpos"},
)
except Exception as e:
- return {"message": str(e)}, HTTPStatus.INTERNAL_SERVER_ERROR
+ raise HTTPException(
+ status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+ detail=str(e)
+ )
+ # return {"message": str(e)}, HTTPStatus.INTERNAL_SERVER_ERROR
- return {"payment_hash": payment_hash, "payment_request": payment_request}, HTTPStatus.CREATED
+ return {"payment_hash": payment_hash, "payment_request": payment_request}
-@tpos_ext.get("/api/v1/tposs/{tpos_id}/invoices/{payment_hash}")
+@tpos_ext.get("/api/v1/tposs/{tpos_id}/invoices/{payment_hash}", status_code=HTTPStatus.OK)
async def api_tpos_check_invoice(tpos_id: str, payment_hash: str):
tpos = await get_tpos(tpos_id)
-
if not tpos:
- return {"message": "TPoS does not exist."}, HTTPStatus.NOT_FOUND
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="TPoS does not exist."
+ )
+ # return {"message": "TPoS does not exist."}, HTTPStatus.NOT_FOUND
try:
status = await check_invoice_status(tpos.wallet, payment_hash)
is_paid = not status.pending
except Exception as exc:
print(exc)
- return {"paid": False}, HTTPStatus.OK
+ return {"paid": False}
if is_paid:
wallet = await get_wallet(tpos.wallet)
payment = await wallet.get_payment(payment_hash)
await payment.set_pending(False)
- return {"paid": True}, HTTPStatus.OK
+ return {"paid": True}
- return {"paid": False}, HTTPStatus.OK
+ return {"paid": False}
diff --git a/lnbits/extensions/usermanager/README.md b/lnbits/extensions/usermanager/README.md
deleted file mode 100644
index b6f30627..00000000
--- a/lnbits/extensions/usermanager/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# User Manager
-
-## Make and manage users/wallets
-
-To help developers use LNbits to manage their users, the User Manager extension allows the creation and management of users and wallets.
-
-For example, a games developer may be developing a game that needs each user to have their own wallet, LNbits can be included in the developers stack as the user and wallet manager. Or someone wanting to manage their family's wallets (wife, children, parents, etc...) or you want to host a community Lightning Network node and want to manage wallets for the users.
-
-## Usage
-
-1. Click the button "NEW USER" to create a new user\
- 
-2. Fill the user information\
- - username
- - the generated wallet name, user can create other wallets later on
- - email
- - set a password
- 
-3. After creating your user, it will appear in the **Users** section, and a user's wallet in the **Wallets** section.
-4. Next you can share the wallet with the corresponding user\
- 
-5. If you need to create more wallets for some user, click "NEW WALLET" at the top\
- 
- - select the existing user you wish to add the wallet
- - set a wallet name\
- 
diff --git a/lnbits/extensions/usermanager/__init__.py b/lnbits/extensions/usermanager/__init__.py
deleted file mode 100644
index 53154812..00000000
--- a/lnbits/extensions/usermanager/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from quart import Blueprint
-from lnbits.db import Database
-
-db = Database("ext_usermanager")
-
-usermanager_ext: Blueprint = Blueprint(
- "usermanager", __name__, static_folder="static", template_folder="templates"
-)
-
-
-from .views_api import * # noqa
-from .views import * # noqa
diff --git a/lnbits/extensions/usermanager/config.json b/lnbits/extensions/usermanager/config.json
deleted file mode 100644
index 7391ec29..00000000
--- a/lnbits/extensions/usermanager/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "User Manager",
- "short_description": "Generate users and wallets",
- "icon": "person_add",
- "contributors": ["benarc"]
-}
diff --git a/lnbits/extensions/usermanager/crud.py b/lnbits/extensions/usermanager/crud.py
deleted file mode 100644
index a7854ad8..00000000
--- a/lnbits/extensions/usermanager/crud.py
+++ /dev/null
@@ -1,122 +0,0 @@
-from typing import Optional, List
-
-from lnbits.core.models import Payment
-from lnbits.core.crud import (
- create_account,
- get_user,
- get_payments,
- create_wallet,
- delete_wallet,
-)
-
-from . import db
-from .models import Users, Wallets
-
-
-### Users
-
-
-async def create_usermanager_user(
- user_name: str,
- wallet_name: str,
- admin_id: str,
- email: Optional[str] = None,
- password: Optional[str] = None,
-) -> Users:
- account = await create_account()
- user = await get_user(account.id)
- assert user, "Newly created user couldn't be retrieved"
-
- wallet = await create_wallet(user_id=user.id, wallet_name=wallet_name)
-
- await db.execute(
- """
- INSERT INTO usermanager.users (id, name, admin, email, password)
- VALUES (?, ?, ?, ?, ?)
- """,
- (user.id, user_name, admin_id, email, password),
- )
-
- await db.execute(
- """
- INSERT INTO usermanager.wallets (id, admin, name, "user", adminkey, inkey)
- VALUES (?, ?, ?, ?, ?, ?)
- """,
- (wallet.id, admin_id, wallet_name, user.id, wallet.adminkey, wallet.inkey),
- )
-
- user_created = await get_usermanager_user(user.id)
- assert user_created, "Newly created user couldn't be retrieved"
- return user_created
-
-
-async def get_usermanager_user(user_id: str) -> Optional[Users]:
- row = await db.fetchone("SELECT * FROM usermanager.users WHERE id = ?", (user_id,))
- return Users(**row) if row else None
-
-
-async def get_usermanager_users(user_id: str) -> List[Users]:
- rows = await db.fetchall(
- "SELECT * FROM usermanager.users WHERE admin = ?", (user_id,)
- )
- return [Users(**row) for row in rows]
-
-
-async def delete_usermanager_user(user_id: str) -> None:
- wallets = await get_usermanager_wallets(user_id)
- for wallet in wallets:
- await delete_wallet(user_id=user_id, wallet_id=wallet.id)
-
- await db.execute("DELETE FROM usermanager.users WHERE id = ?", (user_id,))
- await db.execute("""DELETE FROM usermanager.wallets WHERE "user" = ?""", (user_id,))
-
-
-### Wallets
-
-
-async def create_usermanager_wallet(
- user_id: str, wallet_name: str, admin_id: str
-) -> Wallets:
- wallet = await create_wallet(user_id=user_id, wallet_name=wallet_name)
- await db.execute(
- """
- INSERT INTO usermanager.wallets (id, admin, name, "user", adminkey, inkey)
- VALUES (?, ?, ?, ?, ?, ?)
- """,
- (wallet.id, admin_id, wallet_name, user_id, wallet.adminkey, wallet.inkey),
- )
- wallet_created = await get_usermanager_wallet(wallet.id)
- assert wallet_created, "Newly created wallet couldn't be retrieved"
- return wallet_created
-
-
-async def get_usermanager_wallet(wallet_id: str) -> Optional[Wallets]:
- row = await db.fetchone(
- "SELECT * FROM usermanager.wallets WHERE id = ?", (wallet_id,)
- )
- return Wallets(**row) if row else None
-
-
-async def get_usermanager_wallets(admin_id: str) -> Optional[Wallets]:
- rows = await db.fetchall(
- "SELECT * FROM usermanager.wallets WHERE admin = ?", (admin_id,)
- )
- return [Wallets(**row) for row in rows]
-
-
-async def get_usermanager_users_wallets(user_id: str) -> Optional[Wallets]:
- rows = await db.fetchall(
- """SELECT * FROM usermanager.wallets WHERE "user" = ?""", (user_id,)
- )
- return [Wallets(**row) for row in rows]
-
-
-async def get_usermanager_wallet_transactions(wallet_id: str) -> Optional[Payment]:
- return await get_payments(
- wallet_id=wallet_id, complete=True, pending=False, outgoing=True, incoming=True
- )
-
-
-async def delete_usermanager_wallet(wallet_id: str, user_id: str) -> None:
- await delete_wallet(user_id=user_id, wallet_id=wallet_id)
- await db.execute("DELETE FROM usermanager.wallets WHERE id = ?", (wallet_id,))
diff --git a/lnbits/extensions/usermanager/migrations.py b/lnbits/extensions/usermanager/migrations.py
deleted file mode 100644
index 62a21575..00000000
--- a/lnbits/extensions/usermanager/migrations.py
+++ /dev/null
@@ -1,31 +0,0 @@
-async def m001_initial(db):
- """
- Initial users table.
- """
- await db.execute(
- """
- CREATE TABLE usermanager.users (
- id TEXT PRIMARY KEY,
- name TEXT NOT NULL,
- admin TEXT NOT NULL,
- email TEXT,
- password TEXT
- );
- """
- )
-
- """
- Initial wallets table.
- """
- await db.execute(
- """
- CREATE TABLE usermanager.wallets (
- id TEXT PRIMARY KEY,
- admin TEXT NOT NULL,
- name TEXT NOT NULL,
- "user" TEXT NOT NULL,
- adminkey TEXT NOT NULL,
- inkey TEXT NOT NULL
- );
- """
- )
diff --git a/lnbits/extensions/usermanager/models.py b/lnbits/extensions/usermanager/models.py
deleted file mode 100644
index 48472119..00000000
--- a/lnbits/extensions/usermanager/models.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from sqlite3 import Row
-from pydantic import BaseModel
-
-
-class Users(BaseModel):
- id: str
- name: str
- admin: str
- email: str
- password: str
-
-
-class Wallets(BaseModel):
- id: str
- admin: str
- name: str
- user: str
- adminkey: str
- inkey: str
-
- @classmethod
- def from_row(cls, row: Row) -> "Wallets":
- return cls(**dict(row))
diff --git a/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html b/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html
deleted file mode 100644
index 74640bb8..00000000
--- a/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-
- New Domain
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
- Domains
-
- Export to CSV
-
-
-
-
-
- Subdomains
-
- Export to CSV
-
-
-
-
-
-
- {% include "subdomains/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} Subdomain extension -
-
- Update Form
- Create Domain
- Cancel
-
- - User Manager: Make and manager users/wallets -
-
- To help developers use LNbits to manage their users, the User Manager
- extension allows the creation and management of users and wallets.
-
For example, a games developer may be developing a game that needs
- each user to have their own wallet, LNbits can be included in the
- develpoers stack as the user and wallet manager.
-
- Created by, Ben Arc
-
GET
- /usermanager/api/v1/users
- Body (application/json)
-- Returns 201 CREATED (application/json) -
-JSON list of users
- Curl example
-curl -X GET {{ request.url_root }}usermanager/api/v1/users -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- GET
- /usermanager/api/v1/users/<user_id>
- Body (application/json)
-- Returns 201 CREATED (application/json) -
-JSON list of users
- Curl example
-curl -X GET {{ request.url_root }}usermanager/api/v1/users/<user_id> -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- GET
- /usermanager/api/v1/wallets/<user_id>
- Headers
-{"X-Api-Key": <string>}
- Body (application/json)
-- Returns 201 CREATED (application/json) -
-JSON wallet data
- Curl example
-curl -X GET {{ request.url_root }}usermanager/api/v1/wallets/<user_id> -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- GET
- /usermanager/api/v1/wallets<wallet_id>
- Headers
-{"X-Api-Key": <string>}
- Body (application/json)
-- Returns 201 CREATED (application/json) -
-JSON a wallets transactions
- Curl example
-curl -X GET {{ request.url_root }}usermanager/api/v1/wallets<wallet_id> -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- POST
- /usermanager/api/v1/users
- Headers
-{"X-Api-Key": <string>, "Content-type":
- "application/json"}
- - Body (application/json) - "admin_id" is a YOUR user ID -
-{"admin_id": <string>, "user_name": <string>,
- "wallet_name": <string>,"email": <Optional string>
- ,"password": <Optional string>}
- - Returns 201 CREATED (application/json) -
-{"id": <string>, "name": <string>, "admin":
- <string>, "email": <string>, "password":
- <string>}
- Curl example
-curl -X POST {{ request.url_root }}usermanager/api/v1/users -d '{"admin_id": "{{
- g.user.id }}", "wallet_name": <string>, "user_name":
- <string>, "email": <Optional string>, "password": <
- Optional string>}' -H "X-Api-Key: {{ g.user.wallets[0].inkey }}" -H
- "Content-type: application/json"
-
- POST
- /usermanager/api/v1/wallets
- Headers
-{"X-Api-Key": <string>, "Content-type":
- "application/json"}
- - Body (application/json) - "admin_id" is a YOUR user ID -
-{"user_id": <string>, "wallet_name": <string>,
- "admin_id": <string>}
- - Returns 201 CREATED (application/json) -
-{"id": <string>, "admin": <string>, "name":
- <string>, "user": <string>, "adminkey": <string>,
- "inkey": <string>}
- Curl example
-curl -X POST {{ request.url_root }}usermanager/api/v1/wallets -d '{"user_id":
- <string>, "wallet_name": <string>, "admin_id": "{{
- g.user.id }}"}' -H "X-Api-Key: {{ g.user.wallets[0].inkey }}" -H
- "Content-type: application/json"
-
- DELETE
- /usermanager/api/v1/users/<user_id>
- Headers
-{"X-Api-Key": <string>}
- Curl example
-curl -X DELETE {{ request.url_root }}usermanager/api/v1/users/<user_id> -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- DELETE
- /usermanager/api/v1/wallets/<wallet_id>
- Headers
-{"X-Api-Key": <string>}
- Curl example
-curl -X DELETE {{ request.url_root }}usermanager/api/v1/wallets/<wallet_id>
- -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- POST
- /usermanager/api/v1/extensions
- Headers
-{"X-Api-Key": <string>}
- Curl example
-curl -X POST {{ request.url_root }}usermanager/api/v1/extensions -d '{"userid":
- <string>, "extension": <string>, "active":
- <integer>}' -H "X-Api-Key: {{ g.user.wallets[0].inkey }}" -H
- "Content-type: application/json"
-
-
-
-
-
- Create User
- Cancel
-
-
-
-
-
-
-
-
-
- Create Wallet
- Cancel
-
-
-
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-{% endblock %}
diff --git a/lnbits/extensions/usermanager/views.py b/lnbits/extensions/usermanager/views.py
deleted file mode 100644
index 5bd72a51..00000000
--- a/lnbits/extensions/usermanager/views.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from quart import g, render_template
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import usermanager_ext
-from fastapi import Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@usermanager_ext.get("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("usermanager/index.html", {"request":request,"user":g.user})
diff --git a/lnbits/extensions/usermanager/views_api.py b/lnbits/extensions/usermanager/views_api.py
deleted file mode 100644
index 78217589..00000000
--- a/lnbits/extensions/usermanager/views_api.py
+++ /dev/null
@@ -1,148 +0,0 @@
-from typing import Optional
-from quart import g, jsonify
-from http import HTTPStatus
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-
-from fastapi import FastAPI, Query
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import JSONResponse
-from pydantic import BaseModel
-
-from . import usermanager_ext
-from .crud import (
- create_usermanager_user,
- get_usermanager_user,
- get_usermanager_users,
- get_usermanager_wallet_transactions,
- delete_usermanager_user,
- create_usermanager_wallet,
- get_usermanager_wallet,
- get_usermanager_wallets,
- get_usermanager_users_wallets,
- delete_usermanager_wallet,
-)
-from lnbits.core import update_user_extension
-
-
-### Users
-
-
-@usermanager_ext.get("/api/v1/users")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_users():
- user_id = g.wallet.user
- return ([user._asdict() for user in await get_usermanager_users(user_id)],
- HTTPStatus.OK,
- )
-
-
-@usermanager_ext.get("/api/v1/users/{user_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_user(user_id):
- user = await get_usermanager_user(user_id)
- return (user._asdict(),
- HTTPStatus.OK,
- )
-
-class CreateUsersData(BaseModel):
- domain: str
- subdomain: str
- email: str
- ip: Optional[str]
- sats: Optional[str]
-
-@usermanager_ext.post("/api/v1/users")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_users_create(data: CreateUsersData):
- user = await create_usermanager_user(**data)
- full = user._asdict()
- full["wallets"] = [wallet._asdict() for wallet in await get_usermanager_users_wallets(user.id)]
- return jsonify(full), HTTPStatus.CREATED
-
-
-@usermanager_ext.delete("/api/v1/users/{user_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_users_delete(user_id):
- user = await get_usermanager_user(user_id)
- if not user:
- return {"message": "User does not exist."}, HTTPStatus.NOT_FOUND
- await delete_usermanager_user(user_id)
- return "", HTTPStatus.NO_CONTENT
-
-
-###Activate Extension
-
-class CreateUsersData(BaseModel):
- extension: str
- userid: str
- active: bool
-
-@usermanager_ext.post("/api/v1/extensions")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_activate_extension(data: CreateUsersData):
- user = await get_user(data.userid)
- if not user:
- return {"message": "no such user"}, HTTPStatus.NOT_FOUND
- update_user_extension(
- user_id=data.userid, extension=data.extension, active=data.active
- )
- return {"extension": "updated"}, HTTPStatus.CREATED
-
-
-###Wallets
-
-class CreateWalletsData(BaseModel):
- user_id: str
- wallet_name: str
- admin_id: str
-
-@usermanager_ext.post("/api/v1/wallets")
-@api_check_wallet_key(key_type="invoice")
-
-async def api_usermanager_wallets_create(data: CreateWalletsData):
- user = await create_usermanager_wallet(
- data.user_id, data.wallet_name, data.admin_id
- )
- return user._asdict(), HTTPStatus.CREATED
-
-
-@usermanager_ext.get("/api/v1/wallets")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_wallets():
- admin_id = g.wallet.user
- return (
- [wallet._asdict() for wallet in await get_usermanager_wallets(admin_id)],
- HTTPStatus.OK,
- )
-
-
-@usermanager_ext.get("/api/v1/wallets/{wallet_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_wallet_transactions(wallet_id):
- return await get_usermanager_wallet_transactions(wallet_id), HTTPStatus.OK
-
-
-@usermanager_ext.get("/api/v1/wallets/{user_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_users_wallets(user_id):
- wallet = await get_usermanager_users_wallets(user_id)
- return (
- [
- wallet._asdict()
- for wallet in await get_usermanager_users_wallets(user_id)
- ],
- HTTPStatus.OK,
- )
-
-
-@usermanager_ext.delete("/api/v1/wallets/{wallet_id}")
-@api_check_wallet_key(key_type="invoice")
-async def api_usermanager_wallets_delete(wallet_id):
- wallet = await get_usermanager_wallet(wallet_id)
- if not wallet:
- return {"message": "Wallet does not exist."}, HTTPStatus.NOT_FOUND
-
- await delete_usermanager_wallet(wallet_id, wallet.user)
- return "", HTTPStatus.NO_CONTENT
diff --git a/lnbits/extensions/watchonly/README.md b/lnbits/extensions/watchonly/README.md
deleted file mode 100644
index d93f7162..00000000
--- a/lnbits/extensions/watchonly/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Watch Only wallet
-
-## Monitor an onchain wallet and generate addresses for onchain payments
-
-Monitor an extended public key and generate deterministic fresh public keys with this simple watch only wallet. Invoice payments can also be generated, both through a publically shareable page and API.
-
-1. Start by clicking "NEW WALLET"\
- 
-2. Fill the requested fields:
- - give the wallet a name
- - paste an Extended Public Key (xpub, ypub, zpub)
- - click "CREATE WATCH-ONLY WALLET"\
- 
-3. You can then access your onchain addresses\
- 
-4. You can then generate bitcoin onchain adresses from LNbits\
- 
-
-You can now use this wallet on the LNBits [SatsPayServer](https://github.com/lnbits/lnbits/blob/master/lnbits/extensions/satspay/README.md) extension
diff --git a/lnbits/extensions/watchonly/__init__.py b/lnbits/extensions/watchonly/__init__.py
deleted file mode 100644
index b8df3197..00000000
--- a/lnbits/extensions/watchonly/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from quart import Blueprint
-from lnbits.db import Database
-
-db = Database("ext_watchonly")
-
-
-watchonly_ext: Blueprint = Blueprint(
- "watchonly", __name__, static_folder="static", template_folder="templates"
-)
-
-
-from .views_api import * # noqa
-from .views import * # noqa
diff --git a/lnbits/extensions/watchonly/config.json b/lnbits/extensions/watchonly/config.json
deleted file mode 100644
index 48c19ef0..00000000
--- a/lnbits/extensions/watchonly/config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "Watch Only",
- "short_description": "Onchain watch only wallets",
- "icon": "visibility",
- "contributors": [
- "arcbtc"
- ]
-}
diff --git a/lnbits/extensions/watchonly/crud.py b/lnbits/extensions/watchonly/crud.py
deleted file mode 100644
index bd301eb4..00000000
--- a/lnbits/extensions/watchonly/crud.py
+++ /dev/null
@@ -1,212 +0,0 @@
-from typing import List, Optional
-
-from . import db
-from .models import Wallets, Addresses, Mempool
-
-from lnbits.helpers import urlsafe_short_hash
-
-from embit.descriptor import Descriptor, Key # type: ignore
-from embit.descriptor.arguments import AllowedDerivation # type: ignore
-from embit.networks import NETWORKS # type: ignore
-
-
-##########################WALLETS####################
-
-
-def detect_network(k):
- version = k.key.version
- for network_name in NETWORKS:
- net = NETWORKS[network_name]
- # not found in this network
- if version in [net["xpub"], net["ypub"], net["zpub"], net["Zpub"], net["Ypub"]]:
- return net
-
-
-def parse_key(masterpub: str):
- """Parses masterpub or descriptor and returns a tuple: (Descriptor, network)
- To create addresses use descriptor.derive(num).address(network=network)
- """
- network = None
- # probably a single key
- if "(" not in masterpub:
- k = Key.from_string(masterpub)
- if not k.is_extended:
- raise ValueError("The key is not a master public key")
- if k.is_private:
- raise ValueError("Private keys are not allowed")
- # check depth
- if k.key.depth != 3:
- raise ValueError(
- "Non-standard depth. Only bip44, bip49 and bip84 are supported with bare xpubs. For custom derivation paths use descriptors."
- )
- # if allowed derivation is not provided use default /{0,1}/*
- if k.allowed_derivation is None:
- k.allowed_derivation = AllowedDerivation.default()
- # get version bytes
- version = k.key.version
- for network_name in NETWORKS:
- net = NETWORKS[network_name]
- # not found in this network
- if version in [net["xpub"], net["ypub"], net["zpub"]]:
- network = net
- if version == net["xpub"]:
- desc = Descriptor.from_string("pkh(%s)" % str(k))
- elif version == net["ypub"]:
- desc = Descriptor.from_string("sh(wpkh(%s))" % str(k))
- elif version == net["zpub"]:
- desc = Descriptor.from_string("wpkh(%s)" % str(k))
- break
- # we didn't find correct version
- if network is None:
- raise ValueError("Unknown master public key version")
- else:
- desc = Descriptor.from_string(masterpub)
- if not desc.is_wildcard:
- raise ValueError("Descriptor should have wildcards")
- for k in desc.keys:
- if k.is_extended:
- net = detect_network(k)
- if net is None:
- raise ValueError(f"Unknown version: {k}")
- if network is not None and network != net:
- raise ValueError("Keys from different networks")
- network = net
- return desc, network
-
-
-async def create_watch_wallet(*, user: str, masterpub: str, title: str) -> Wallets:
- # check the masterpub is fine, it will raise an exception if not
- parse_key(masterpub)
- wallet_id = urlsafe_short_hash()
- await db.execute(
- """
- INSERT INTO watchonly.wallets (
- id,
- "user",
- masterpub,
- title,
- address_no,
- balance
- )
- VALUES (?, ?, ?, ?, ?, ?)
- """,
- # address_no is -1 so fresh address on empty wallet can get address with index 0
- (wallet_id, user, masterpub, title, -1, 0),
- )
-
- return await get_watch_wallet(wallet_id)
-
-
-async def get_watch_wallet(wallet_id: str) -> Optional[Wallets]:
- row = await db.fetchone(
- "SELECT * FROM watchonly.wallets WHERE id = ?", (wallet_id,)
- )
- return Wallets.from_row(row) if row else None
-
-
-async def get_watch_wallets(user: str) -> List[Wallets]:
- rows = await db.fetchall(
- """SELECT * FROM watchonly.wallets WHERE "user" = ?""", (user,)
- )
- return [Wallets(**row) for row in rows]
-
-
-async def update_watch_wallet(wallet_id: str, **kwargs) -> Optional[Wallets]:
- q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-
- await db.execute(
- f"UPDATE watchonly.wallets SET {q} WHERE id = ?", (*kwargs.values(), wallet_id)
- )
- row = await db.fetchone(
- "SELECT * FROM watchonly.wallets WHERE id = ?", (wallet_id,)
- )
- return Wallets.from_row(row) if row else None
-
-
-async def delete_watch_wallet(wallet_id: str) -> None:
- await db.execute("DELETE FROM watchonly.wallets WHERE id = ?", (wallet_id,))
-
- ########################ADDRESSES#######################
-
-
-async def get_derive_address(wallet_id: str, num: int):
- wallet = await get_watch_wallet(wallet_id)
- key = wallet[2]
- desc, network = parse_key(key)
- return desc.derive(num).address(network=network)
-
-
-async def get_fresh_address(wallet_id: str) -> Optional[Addresses]:
- wallet = await get_watch_wallet(wallet_id)
- if not wallet:
- return None
-
- address = await get_derive_address(wallet_id, wallet[4] + 1)
-
- await update_watch_wallet(wallet_id=wallet_id, address_no=wallet[4] + 1)
- masterpub_id = urlsafe_short_hash()
- await db.execute(
- """
- INSERT INTO watchonly.addresses (
- id,
- address,
- wallet,
- amount
- )
- VALUES (?, ?, ?, ?)
- """,
- (masterpub_id, address, wallet_id, 0),
- )
-
- return await get_address(address)
-
-
-async def get_address(address: str) -> Optional[Addresses]:
- row = await db.fetchone(
- "SELECT * FROM watchonly.addresses WHERE address = ?", (address,)
- )
- return Addresses.from_row(row) if row else None
-
-
-async def get_addresses(wallet_id: str) -> List[Addresses]:
- rows = await db.fetchall(
- "SELECT * FROM watchonly.addresses WHERE wallet = ?", (wallet_id,)
- )
- return [Addresses(**row) for row in rows]
-
-
-######################MEMPOOL#######################
-
-
-async def create_mempool(user: str) -> Optional[Mempool]:
- await db.execute(
- """
- INSERT INTO watchonly.mempool ("user",endpoint)
- VALUES (?, ?)
- """,
- (user, "https://mempool.space"),
- )
- row = await db.fetchone(
- """SELECT * FROM watchonly.mempool WHERE "user" = ?""", (user,)
- )
- return Mempool.from_row(row) if row else None
-
-
-async def update_mempool(user: str, **kwargs) -> Optional[Mempool]:
- q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-
- await db.execute(
- f"""UPDATE watchonly.mempool SET {q} WHERE "user" = ?""",
- (*kwargs.values(), user),
- )
- row = await db.fetchone(
- """SELECT * FROM watchonly.mempool WHERE "user" = ?""", (user,)
- )
- return Mempool.from_row(row) if row else None
-
-
-async def get_mempool(user: str) -> Mempool:
- row = await db.fetchone(
- """SELECT * FROM watchonly.mempool WHERE "user" = ?""", (user,)
- )
- return Mempool.from_row(row) if row else None
diff --git a/lnbits/extensions/watchonly/migrations.py b/lnbits/extensions/watchonly/migrations.py
deleted file mode 100644
index 05c229b5..00000000
--- a/lnbits/extensions/watchonly/migrations.py
+++ /dev/null
@@ -1,36 +0,0 @@
-async def m001_initial(db):
- """
- Initial wallet table.
- """
- await db.execute(
- """
- CREATE TABLE watchonly.wallets (
- id TEXT NOT NULL PRIMARY KEY,
- "user" TEXT,
- masterpub TEXT NOT NULL,
- title TEXT NOT NULL,
- address_no INTEGER NOT NULL DEFAULT 0,
- balance INTEGER NOT NULL
- );
- """
- )
-
- await db.execute(
- """
- CREATE TABLE watchonly.addresses (
- id TEXT NOT NULL PRIMARY KEY,
- address TEXT NOT NULL,
- wallet TEXT NOT NULL,
- amount INTEGER NOT NULL
- );
- """
- )
-
- await db.execute(
- """
- CREATE TABLE watchonly.mempool (
- "user" TEXT NOT NULL,
- endpoint TEXT NOT NULL
- );
- """
- )
diff --git a/lnbits/extensions/watchonly/models.py b/lnbits/extensions/watchonly/models.py
deleted file mode 100644
index cc63283b..00000000
--- a/lnbits/extensions/watchonly/models.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from sqlite3 import Row
-from pydantic import BaseModel
-
-
-class Wallets(BaseModel):
- id: str
- user: str
- masterpub: str
- title: str
- address_no: int
- balance: int
-
- @classmethod
- def from_row(cls, row: Row) -> "Wallets":
- return cls(**dict(row))
-
-
-class Mempool(BaseModel):
- user: str
- endpoint: str
-
- @classmethod
- def from_row(cls, row: Row) -> "Mempool":
- return cls(**dict(row))
-
-
-class Addresses(BaseModel):
- id: str
- address: str
- wallet: str
- amount: int
-
- @classmethod
- def from_row(cls, row: Row) -> "Addresses":
- return cls(**dict(row))
diff --git a/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html b/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html
deleted file mode 100644
index 97fdb8a9..00000000
--- a/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html
+++ /dev/null
@@ -1,244 +0,0 @@
-
-
-
- New User
- New Wallet
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
- {{ col.value }}
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
- {% raw %}
-
-
-
- {{ col.label }}
-
-
-
-
-
-
- Link to wallet
-
-
- {{ col.value }}
-
-
-
-
-
- {% endraw %}
-
-
-
-
-
-
-
-
-
- Users
-
- Export to CSV
-
-
-
-
-
- Wallets
-
- Export to CSV
-
-
-
-
-
-
- {% include "usermanager/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} User Manager Extension -
-
- Watch Only extension uses mempool.space
- For use with "account Extended Public Key"
- https://iancoleman.io/bip39/
-
-
Created by,
- Ben Arc (using,
- Embit)
-
GET /watchonly/api/v1/wallet
- Headers
-{"X-Api-Key": <invoice_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<wallets_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/wallet -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- GET
- /watchonly/api/v1/wallet/<wallet_id>
- Headers
-{"X-Api-Key": <invoice_key>}-
- Body (application/json) -
-- Returns 201 CREATED (application/json) -
-[<wallet_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/wallet/<wallet_id>
- -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- POST /watchonly/api/v1/wallet
- Headers
-{"X-Api-Key": <admin_key>}-
- Body (application/json) -
-- Returns 201 CREATED (application/json) -
-[<wallet_object>, ...]
- Curl example
-curl -X POST {{ request.url_root }}api/v1/wallet -d '{"title":
- <string>, "masterpub": <string>}' -H "Content-type:
- application/json" -H "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
-
- DELETE
- /watchonly/api/v1/wallet/<wallet_id>
- Headers
-{"X-Api-Key": <admin_key>}-
Returns 204 NO CONTENT
-Curl example
-curl -X DELETE {{ request.url_root
- }}api/v1/wallet/<wallet_id> -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
-
- GET
- /watchonly/api/v1/addresses/<wallet_id>
- Headers
-{"X-Api-Key": <invoice_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<address_object>, ...]
- Curl example
-curl -X GET {{ request.url_root
- }}api/v1/addresses/<wallet_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
-
- GET
- /watchonly/api/v1/address/<wallet_id>
- Headers
-{"X-Api-Key": <invoice_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<address_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/address/<wallet_id>
- -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
-
- GET /watchonly/api/v1/mempool
- Headers
-{"X-Api-Key": <admin_key>}-
- Body (application/json) -
-- Returns 200 OK (application/json) -
-[<mempool_object>, ...]
- Curl example
-curl -X GET {{ request.url_root }}api/v1/mempool -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
-
- POST
- /watchonly/api/v1/mempool
- Headers
-{"X-Api-Key": <admin_key>}-
- Body (application/json) -
-- Returns 201 CREATED (application/json) -
-[<mempool_object>, ...]
- Curl example
-curl -X PUT {{ request.url_root }}api/v1/mempool -d '{"endpoint":
- <string>}' -H "Content-type: application/json" -H "X-Api-Key:
- {{ g.user.wallets[0].adminkey }}"
-
-
-
-
-
-
-
-
-
-
-
- {% raw %}
-
-
-
-
-
- {% endraw %}
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-
-
-
-{% endblock %}
diff --git a/lnbits/extensions/watchonly/views.py b/lnbits/extensions/watchonly/views.py
deleted file mode 100644
index 59fad6ae..00000000
--- a/lnbits/extensions/watchonly/views.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from quart import g, abort, render_template
-from http import HTTPStatus
-
-from lnbits.decorators import check_user_exists, validate_uuids
-
-from . import watchonly_ext
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-
-templates = Jinja2Templates(directory="templates")
-
-@watchonly_ext.get("/")
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("watchonly/index.html", {"request":request,"user":g.user})
-
diff --git a/lnbits/extensions/watchonly/views_api.py b/lnbits/extensions/watchonly/views_api.py
deleted file mode 100644
index e4598a97..00000000
--- a/lnbits/extensions/watchonly/views_api.py
+++ /dev/null
@@ -1,125 +0,0 @@
-import hashlib
-from quart import g, jsonify, url_for, request
-from http import HTTPStatus
-import httpx
-import json
-
-from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-
-from lnbits.extensions.watchonly import watchonly_ext
-from .crud import (
- create_watch_wallet,
- get_watch_wallet,
- get_watch_wallets,
- update_watch_wallet,
- delete_watch_wallet,
- get_fresh_address,
- get_addresses,
- create_mempool,
- update_mempool,
- get_mempool,
-)
-
-###################WALLETS#############################
-
-
-@watchonly_ext.get("/api/v1/wallet")
-@api_check_wallet_key("invoice")
-async def api_wallets_retrieve():
-
- try:
- return (
- [wallet._asdict() for wallet in await get_watch_wallets(g.wallet.user)],
- HTTPStatus.OK,
- )
- except:
- return ""
-
-
-@watchonly_ext.get("/api/v1/wallet/{wallet_id}")
-@api_check_wallet_key("invoice")
-async def api_wallet_retrieve(wallet_id):
- wallet = await get_watch_wallet(wallet_id)
-
- if not wallet:
- return {"message": "wallet does not exist"}, HTTPStatus.NOT_FOUND
-
- return wallet._asdict(), HTTPStatus.OK
-
-
-@watchonly_ext.post("/api/v1/wallet")
-@api_check_wallet_key("admin")
-async def api_wallet_create_or_update(masterPub: str, Title: str, wallet_id=None):
- try:
- wallet = await create_watch_wallet(
- user=g.wallet.user, masterpub=masterPub, title=Title
- )
- except Exception as e:
- return {"message": str(e)}, HTTPStatus.BAD_REQUEST
- mempool = await get_mempool(g.wallet.user)
- if not mempool:
- create_mempool(user=g.wallet.user)
- return wallet._asdict(), HTTPStatus.CREATED
-
-
-@watchonly_ext.delete("/api/v1/wallet/{wallet_id}")
-@api_check_wallet_key("admin")
-async def api_wallet_delete(wallet_id):
- wallet = await get_watch_wallet(wallet_id)
-
- if not wallet:
- return {"message": "Wallet link does not exist."}, HTTPStatus.NOT_FOUND
-
- await delete_watch_wallet(wallet_id)
-
- return {"deleted": "true"}, HTTPStatus.NO_CONTENT
-
-
-#############################ADDRESSES##########################
-
-
-@watchonly_ext.get("/api/v1/address/{wallet_id}")
-@api_check_wallet_key("invoice")
-async def api_fresh_address(wallet_id):
- await get_fresh_address(wallet_id)
-
- addresses = await get_addresses(wallet_id)
-
- return [address._asdict() for address in addresses], HTTPStatus.OK
-
-
-@watchonly_ext.get("/api/v1/addresses/{wallet_id}")
-@api_check_wallet_key("invoice")
-async def api_get_addresses(wallet_id):
- wallet = await get_watch_wallet(wallet_id)
-
- if not wallet:
- return {"message": "wallet does not exist"}, HTTPStatus.NOT_FOUND
-
- addresses = await get_addresses(wallet_id)
-
- if not addresses:
- await get_fresh_address(wallet_id)
- addresses = await get_addresses(wallet_id)
-
- return [address._asdict() for address in addresses], HTTPStatus.OK
-
-
-#############################MEMPOOL##########################
-
-
-@watchonly_ext.put("/api/v1/mempool")
-@api_check_wallet_key("admin")
-async def api_update_mempool(endpoint: str):
- mempool = await update_mempool(user=g.wallet.user, **endpoint)
- return mempool._asdict(), HTTPStatus.OK
-
-
-@watchonly_ext.get("/api/v1/mempool")
-@api_check_wallet_key("admin")
-async def api_get_mempool():
- mempool = await get_mempool(g.wallet.user)
- if not mempool:
- mempool = await create_mempool(user=g.wallet.user)
- return mempool._asdict(), HTTPStatus.OK
diff --git a/lnbits/extensions/withdraw/__init__.py b/lnbits/extensions/withdraw/__init__.py
index 69e45e4d..184b4f01 100644
--- a/lnbits/extensions/withdraw/__init__.py
+++ b/lnbits/extensions/withdraw/__init__.py
@@ -1,14 +1,39 @@
-from quart import Blueprint
+from fastapi import APIRouter
+from fastapi.staticfiles import StaticFiles
+
from lnbits.db import Database
+from lnbits.helpers import template_renderer
db = Database("ext_withdraw")
+withdraw_static_files = [
+ {
+ "path": "/withdraw/static",
+ "app": StaticFiles(directory="lnbits/extensions/withdraw/static"),
+ "name": "withdraw_static",
+ }
+]
-withdraw_ext: Blueprint = Blueprint(
- "withdraw", __name__, static_folder="static", template_folder="templates"
+
+withdraw_ext: APIRouter = APIRouter(
+ prefix="/withdraw",
+ tags=["withdraw"],
+ # "withdraw", __name__, static_folder="static", template_folder="templates"
)
+def withdraw_renderer():
+ return template_renderer(
+ [
+ "lnbits/extensions/withdraw/templates",
+ ]
+ )
+
from .views_api import * # noqa
from .views import * # noqa
from .lnurl import * # noqa
+
+
+# @withdraw_ext.on_event("startup")
+# def _do_it():
+# register_listeners()
diff --git a/lnbits/extensions/withdraw/crud.py b/lnbits/extensions/withdraw/crud.py
index 14178a0c..183d8629 100644
--- a/lnbits/extensions/withdraw/crud.py
+++ b/lnbits/extensions/withdraw/crud.py
@@ -3,18 +3,12 @@ from typing import List, Optional, Union
from lnbits.helpers import urlsafe_short_hash
from . import db
-from .models import WithdrawLink, HashCheck
+from .models import WithdrawLink, HashCheck, CreateWithdrawData
async def create_withdraw_link(
- *,
+ data: CreateWithdrawData,
wallet_id: str,
- title: str,
- min_withdrawable: int,
- max_withdrawable: int,
- uses: int,
- wait_time: int,
- is_unique: bool,
usescsv: str,
) -> WithdrawLink:
link_id = urlsafe_short_hash()
@@ -39,15 +33,15 @@ async def create_withdraw_link(
(
link_id,
wallet_id,
- title,
- min_withdrawable,
- max_withdrawable,
- uses,
- wait_time,
- int(is_unique),
+ data.title,
+ data.min_withdrawable,
+ data.max_withdrawable,
+ data.uses,
+ data.wait_time,
+ int(data.is_unique),
urlsafe_short_hash(),
urlsafe_short_hash(),
- int(datetime.now().timestamp()) + wait_time,
+ int(datetime.now().timestamp()) + data.wait_time,
usescsv,
),
)
@@ -63,11 +57,12 @@ async def get_withdraw_link(link_id: str, num=0) -> Optional[WithdrawLink]:
if not row:
return None
- link = []
- for item in row:
- link.append(item)
- link.append(num)
- return WithdrawLink._make(link)
+ # link = []
+ # for item in row:
+ # link.append(item)
+ # link.append(num)
+ print("GET_LINK", WithdrawLink.from_row(row))
+ return WithdrawLink.from_row(row)
async def get_withdraw_link_by_hash(unique_hash: str, num=0) -> Optional[WithdrawLink]:
@@ -77,11 +72,11 @@ async def get_withdraw_link_by_hash(unique_hash: str, num=0) -> Optional[Withdra
if not row:
return None
- link = []
- for item in row:
- link.append(item)
- link.append(num)
- return WithdrawLink._make(link)
+ # link = []
+ # for item in row:
+ # link.append(item)
+ # link.append(num)
+ return WithdrawLink.from_row(row)
async def get_withdraw_links(wallet_ids: Union[str, List[str]]) -> List[WithdrawLink]:
diff --git a/lnbits/extensions/withdraw/lnurl.py b/lnbits/extensions/withdraw/lnurl.py
index 1c3cde6c..75339cf7 100644
--- a/lnbits/extensions/withdraw/lnurl.py
+++ b/lnbits/extensions/withdraw/lnurl.py
@@ -1,9 +1,9 @@
import shortuuid # type: ignore
from http import HTTPStatus
from datetime import datetime
-from quart import jsonify, request
from lnbits.core.services import pay_invoice
+from starlette.requests import Request
from . import withdraw_ext
from .crud import get_withdraw_link_by_hash, update_withdraw_link
@@ -12,41 +12,57 @@ from .crud import get_withdraw_link_by_hash, update_withdraw_link
# FOR LNURLs WHICH ARE NOT UNIQUE
-@withdraw_ext.get("/api/v1/lnurl/
-
-
- {% raw %}
- New wallet
-
-
-
-
-
-
-
-
-
-
-
-
- {{ col.label }}
-
-
-
-
-
-
-
- Adresses
-
-
-
- {{ col.value }}
-
-
-
-
-
-
-
-
- {% endraw %}
-
-
- Point to another Mempool
- {{ this.mempool.endpoint }}
-
-
-
- set
- cancel
-
-
-
-
-
-
-
- Wallets
-
-
-
-
-
-
-
-
-
-
- {% include "watchonly/_api_docs.html" %}
-
-
-
-
- - {{SITE_TITLE}} Watch Only Extension -
-
- Create Watch-only Wallet
- Cancel
-
- Addresses
--
- Current:
- {{ currentaddress }}
-
-
- Get fresh address
- Close
-
- Curl example
curl -X GET {{ request.url_root }}api/v1/links -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
+ user.wallets[0].inkey }}"
Curl example
curl -X GET {{ request.url_root }}api/v1/links/<withdraw_id> -H
- "X-Api-Key: {{ g.user.wallets[0].inkey }}"
+ "X-Api-Key: {{ user.wallets[0].inkey }}"
@@ -83,7 +83,7 @@
"max_withdrawable": <integer>, "uses": <integer>,
"wait_time": <integer>, "is_unique": <boolean>}' -H
"Content-type: application/json" -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
+ user.wallets[0].adminkey }}"
@@ -119,7 +119,7 @@
"max_withdrawable": <integer>, "uses": <integer>,
"wait_time": <integer>, "is_unique": <boolean>}' -H
"Content-type: application/json" -H "X-Api-Key: {{
- g.user.wallets[0].adminkey }}"
+ user.wallets[0].adminkey }}"
@@ -143,7 +143,7 @@
Curl example
curl -X DELETE {{ request.url_root }}api/v1/links/<withdraw_id>
- -H "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
+ -H "X-Api-Key: {{ user.wallets[0].adminkey }}"
@@ -171,7 +171,7 @@
curl -X GET {{ request.url_root
}}api/v1/links/<the_hash>/<lnurl_id> -H "X-Api-Key: {{
- g.user.wallets[0].inkey }}"
+ user.wallets[0].inkey }}"
diff --git a/lnbits/extensions/withdraw/views.py b/lnbits/extensions/withdraw/views.py
index dc1b6e31..9bdaee45 100644
--- a/lnbits/extensions/withdraw/views.py
+++ b/lnbits/extensions/withdraw/views.py
@@ -1,40 +1,53 @@
-from quart import g, abort, render_template
from http import HTTPStatus
import pyqrcode
from io import BytesIO
-from lnbits.decorators import check_user_exists, validate_uuids
+from lnbits.decorators import check_user_exists
-from . import withdraw_ext
+from . import withdraw_ext, withdraw_renderer
from .crud import get_withdraw_link, chunks
-from fastapi import FastAPI, Request, Response
-
+from fastapi import FastAPI, 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
+
templates = Jinja2Templates(directory="templates")
-@withdraw_ext.get("/", status_code=HTTPStatus.OK)
-@validate_uuids(["usr"], required=True)
-@check_user_exists()
-async def index(request: Request):
- return await templates.TemplateResponse("withdraw/index.html", {"request":request,"user":g.user})
+@withdraw_ext.get("/", response_class=HTMLResponse)
+# @validate_uuids(["usr"], required=True)
+# @check_user_exists()
+async def index(request: Request, user: User = Depends(check_user_exists)):
+ return withdraw_renderer().TemplateResponse("withdraw/index.html", {"request":request,"user": user.dict()})
-@withdraw_ext.get("/{link_id}", status_code=HTTPStatus.OK)
-async def display(request: Request, link_id, response: Response):
+@withdraw_ext.get("/{link_id}", response_class=HTMLResponse)
+async def display(request: Request, link_id):
+ link = await get_withdraw_link(link_id, 0)
+
+ if not link:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="Withdraw link does not exist."
+ )
+ # response.status_code = HTTPStatus.NOT_FOUND
+ # return "Withdraw link does not exist." #probably here is where we should return the 404??
+ return withdraw_renderer().TemplateResponse("withdraw/display.html", {"request":request,"link":{**link.dict(), "lnurl": link.lnurl(request)}, "unique":True})
+
+
+@withdraw_ext.get("/img/{link_id}", response_class=HTMLResponse)
+async def img(request: Request, link_id):
link = await get_withdraw_link(link_id, 0)
if not link:
- response.status_code = HTTPStatus.NOT_FOUND
- return "Withdraw link does not exist." #probably here is where we should return the 404??
- return await templates.TemplateResponse("withdraw/display.html", {"request":request,"link":link, "unique":True})
-
-
-@withdraw_ext.get("/img/{link_id}", status_code=HTTPStatus.OK)
-async def img(request: Request, link_id, response: Response):
- link = await get_withdraw_link(link_id, 0)
- if not link:
- response.status_code = HTTPStatus.NOT_FOUND
- return "Withdraw link does not exist."
- qr = pyqrcode.create(link.lnurl)
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="Withdraw link does not exist."
+ )
+ # response.status_code = HTTPStatus.NOT_FOUND
+ # return "Withdraw link does not exist."
+ qr = pyqrcode.create(link.lnurl(request))
+ print(qr)
stream = BytesIO()
qr.svg(stream, scale=3)
return (
@@ -49,23 +62,35 @@ async def img(request: Request, link_id, response: Response):
)
-@withdraw_ext.get("/print/{link_id}", status_code=HTTPStatus.OK)
-async def print_qr(request: Request, link_id, response: Response):
+@withdraw_ext.get("/print/{link_id}", response_class=HTMLResponse)
+async def print_qr(request: Request, link_id):
link = await get_withdraw_link(link_id)
if not link:
- response.status_code = HTTPStatus.NOT_FOUND
- return "Withdraw link does not exist."
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="Withdraw link does not exist."
+ )
+ # response.status_code = HTTPStatus.NOT_FOUND
+ # return "Withdraw link does not exist."
+
if link.uses == 0:
- return await templates.TemplateResponse("withdraw/print_qr.html", {"request":request,link:link, unique:False})
+
+ return withdraw_renderer().TemplateResponse("withdraw/print_qr.html", {"request":request,"link":link.dict(), unique:False})
links = []
count = 0
+
for x in link.usescsv.split(","):
linkk = await get_withdraw_link(link_id, count)
if not linkk:
- response.status_code = HTTPStatus.NOT_FOUND
- return "Withdraw link does not exist."
- links.append(str(linkk.lnurl))
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND,
+ detail="Withdraw link does not exist."
+ )
+ # response.status_code = HTTPStatus.NOT_FOUND
+ # return "Withdraw link does not exist."
+ links.append(str(linkk.lnurl(request)))
count = count + 1
page_link = list(chunks(links, 2))
linked = list(chunks(page_link, 5))
- return await templates.TemplateResponse("withdraw/print_qr.html", {"request":request,"link":linked, "unique":True})
+ print("LINKED", linked)
+ return withdraw_renderer().TemplateResponse("withdraw/print_qr.html", {"request":request,"link":linked, "unique":True})
diff --git a/lnbits/extensions/withdraw/views_api.py b/lnbits/extensions/withdraw/views_api.py
index d0ad0656..93b498ef 100644
--- a/lnbits/extensions/withdraw/views_api.py
+++ b/lnbits/extensions/withdraw/views_api.py
@@ -1,11 +1,18 @@
-from quart import g, jsonify, request
+from fastapi.params import Depends
+from fastapi.param_functions import Query
+from pydantic.main import BaseModel
+
from http import HTTPStatus
from lnurl.exceptions import InvalidUrl as LnurlInvalidUrl # type: ignore
+from starlette.exceptions import HTTPException
+from starlette.requests import Request
+from starlette.responses import HTMLResponse, JSONResponse # type: ignore
from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
-from pydantic import BaseModel
-from fastapi import FastAPI, Query, Response
+from lnbits.decorators import WalletTypeInfo, get_key_type
+from .models import CreateWithdrawData
+
+# from fastapi import FastAPI, Query, Response
from . import withdraw_ext
from .crud import (
@@ -19,59 +26,75 @@ from .crud import (
)
-@withdraw_ext.get("/api/v1/links", status_code=200)
-@api_check_wallet_key("invoice")
-async def api_links(response: Response):
- wallet_ids = [g.wallet.id]
+@withdraw_ext.get("/api/v1/links", status_code=HTTPStatus.OK)
+# @api_check_wallet_key("invoice")
+async def api_links(req: Request, 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
- if "all_wallets" in request.args:
- wallet_ids = (await get_user(g.wallet.user)).wallet_ids
try:
return [
{
- **link._asdict(),
- **{"lnurl": link.lnurl},
+ **link.dict(),
+ **{"lnurl": link.lnurl(req)},
}
for link in await get_withdraw_links(wallet_ids)
]
-
+
except LnurlInvalidUrl:
- response.status_code = HTTPStatus.UPGRADE_REQUIRED
- return { "message": "LNURLs need to be delivered over a publically accessible `https` domain or Tor." }
+ raise HTTPException(
+ status_code=HTTPStatus.UPGRADE_REQUIRED,
+ detail="LNURLs need to be delivered over a publically accessible `https` domain or Tor.",
+ )
+ # response.status_code = HTTPStatus.UPGRADE_REQUIRED
+ # return { "message": "LNURLs need to be delivered over a publically accessible `https` domain or Tor." }
-@withdraw_ext.get("/api/v1/links/{link_id}", status_code=200)
-@api_check_wallet_key("invoice")
-async def api_link_retrieve(link_id, response: Response):
+@withdraw_ext.get("/api/v1/links/{link_id}", status_code=HTTPStatus.OK)
+# @api_check_wallet_key("invoice")
+async def api_link_retrieve(link_id, wallet: WalletTypeInfo = Depends(get_key_type)):
link = await get_withdraw_link(link_id, 0)
if not link:
- response.status_code = HTTPStatus.NOT_FOUND
- return {"message": "Withdraw link does not exist."}
+ raise HTTPException(
+ detail="Withdraw link does not exist.",
+ status_code=HTTPStatus.NOT_FOUND
+ )
+ # response.status_code = HTTPStatus.NOT_FOUND
+ # return {"message": "Withdraw link does not exist."}
- if link.wallet != g.wallet.id:
- response.status_code = HTTPStatus.FORBIDDEN
- return {"message": "Not your withdraw link."}
+ if link.wallet != wallet.wallet.id:
+ raise HTTPException(
+ detail="Not your withdraw link.",
+ status_code=HTTPStatus.FORBIDDEN
+ )
+ # response.status_code = HTTPStatus.FORBIDDEN
+ # return {"message": "Not your withdraw link."}
+ return {**link, **{"lnurl": link.lnurl(request)}}
- return {**link, **{"lnurl": link.lnurl}}
-
-class CreateData(BaseModel):
- title: str = Query(...)
- min_withdrawable: int = Query(..., ge=1)
- max_withdrawable: int = Query(..., ge=1)
- uses: int = Query(..., ge=1)
- wait_time: int = Query(..., ge=1)
- is_unique: bool
+# class CreateData(BaseModel):
+# title: str = Query(...)
+# min_withdrawable: int = Query(..., ge=1)
+# max_withdrawable: int = Query(..., ge=1)
+# uses: int = Query(..., ge=1)
+# wait_time: int = Query(..., ge=1)
+# is_unique: bool
@withdraw_ext.post("/api/v1/links", status_code=HTTPStatus.CREATED)
-@withdraw_ext.put("/api/v1/links/{link_id}")
-@api_check_wallet_key("admin")
-async def api_link_create_or_update(data: CreateData, link_id: str = None, response: Response):
+@withdraw_ext.put("/api/v1/links/{link_id}", status_code=HTTPStatus.OK)
+# @api_check_wallet_key("admin")
+async def api_link_create_or_update(req: Request, data: CreateWithdrawData, link_id: str = None, wallet: WalletTypeInfo = Depends(get_key_type)):
if data.max_withdrawable < data.min_withdrawable:
- response.status_code = HTTPStatus.BAD_REQUEST
- return {
- "message": "`max_withdrawable` needs to be at least `min_withdrawable`."
- }
+ raise HTTPException(
+ detail="`max_withdrawable` needs to be at least `min_withdrawable`.",
+ status_code=HTTPStatus.BAD_REQUEST
+ )
+ # response.status_code = HTTPStatus.BAD_REQUEST
+ # return {
+ # "message": "`max_withdrawable` needs to be at least `min_withdrawable`."
+ # }
usescsv = ""
for i in range(data.uses):
@@ -84,41 +107,57 @@ async def api_link_create_or_update(data: CreateData, link_id: str = None, respo
if link_id:
link = await get_withdraw_link(link_id, 0)
if not link:
- response.status_code = HTTPStatus.NOT_FOUND
- return {"message": "Withdraw link does not exist."}
- if link.wallet != g.wallet.id:
- response.status_code = HTTPStatus.FORBIDDEN
- return {"message": "Not your withdraw link."}
- link = await update_withdraw_link(link_id, **data, usescsv=usescsv, used=0)
+ raise HTTPException(
+ detail="Withdraw link does not exist.",
+ status_code=HTTPStatus.NOT_FOUND
+ )
+ # response.status_code = HTTPStatus.NOT_FOUND
+ # return {"message": "Withdraw link does not exist."}
+ if link.wallet != wallet.wallet.id:
+ raise HTTPException(
+ detail="Not your withdraw link.",
+ status_code=HTTPStatus.FORBIDDEN
+ )
+ # response.status_code = HTTPStatus.FORBIDDEN
+ # return {"message": "Not your withdraw link."}
+ link = await update_withdraw_link(link_id, data=data, usescsv=usescsv, used=0)
else:
link = await create_withdraw_link(
- wallet_id=g.wallet.id, **data, usescsv=usescsv
+ wallet_id=wallet.wallet.id, data=data, usescsv=usescsv
)
- if link_id:
- response.status_code = HTTPStatus.OK
- return {**link, **{"lnurl": link.lnurl}}
+ # if link_id:
+ # response.status_code = HTTPStatus.OK
+ return {**link.dict(), **{"lnurl": link.lnurl(req)}}
-@withdraw_ext.delete("/api/v1/links/{link_id}", status_code=HTTPStatus.NO_CONTENT)
-@api_check_wallet_key("admin")
-async def api_link_delete(link_id, response: Response):
+@withdraw_ext.delete("/api/v1/links/{link_id}")
+# @api_check_wallet_key("admin")
+async def api_link_delete(link_id, wallet: WalletTypeInfo = Depends(get_key_type)):
link = await get_withdraw_link(link_id)
if not link:
- response.status_code = HTTPStatus.NOT_FOUND
- return {"message": "Withdraw link does not exist."}
+ raise HTTPException(
+ detail="Withdraw link does not exist.",
+ status_code=HTTPStatus.NOT_FOUND
+ )
+ # response.status_code = HTTPStatus.NOT_FOUND
+ # return {"message": "Withdraw link does not exist."}
- if link.wallet != g.wallet.id:
- response.status_code = HTTPStatus.FORBIDDEN
- return {"message": "Not your withdraw link."}
+ if link.wallet != wallet.wallet.id:
+ raise HTTPException(
+ detail="Not your withdraw link.",
+ status_code=HTTPStatus.FORBIDDEN
+ )
+ # response.status_code = HTTPStatus.FORBIDDEN
+ # return {"message": "Not your withdraw link."}
await delete_withdraw_link(link_id)
-
- return ""
+ raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+ # return ""
@withdraw_ext.get("/api/v1/links/{the_hash}/{lnurl_id}", status_code=HTTPStatus.OK)
-@api_check_wallet_key("invoice")
-async def api_hash_retrieve(the_hash, lnurl_id):
+# @api_check_wallet_key("invoice")
+async def api_hash_retrieve(the_hash, lnurl_id, wallet: WalletTypeInfo = Depends(get_key_type)):
hashCheck = await get_hash_check(the_hash, lnurl_id)
return hashCheck