From 412ac8d1101068250f2e33105d2cf71337a66e56 Mon Sep 17 00:00:00 2001 From: Ben Arc Date: Wed, 14 Apr 2021 22:03:36 +0100 Subject: [PATCH] Damn you lnurl --- lnbits/extensions/copilot/__init__.py | 1 + lnbits/extensions/copilot/crud.py | 5 ++++- lnbits/extensions/copilot/models.py | 4 ++-- .../extensions/copilot/templates/copilot/compose.html | 11 ++++++----- lnbits/extensions/copilot/views.py | 2 ++ lnbits/extensions/copilot/views_api.py | 2 ++ 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/lnbits/extensions/copilot/__init__.py b/lnbits/extensions/copilot/__init__.py index 1f227d66..cefe5064 100644 --- a/lnbits/extensions/copilot/__init__.py +++ b/lnbits/extensions/copilot/__init__.py @@ -9,3 +9,4 @@ copilot_ext: Blueprint = Blueprint( from .views_api import * # noqa from .views import * # noqa +from .lnurl import * # noqa \ No newline at end of file diff --git a/lnbits/extensions/copilot/crud.py b/lnbits/extensions/copilot/crud.py index 99d582f2..b5f09278 100644 --- a/lnbits/extensions/copilot/crud.py +++ b/lnbits/extensions/copilot/crud.py @@ -15,6 +15,7 @@ from quart import jsonify async def create_copilot( title: str, user: str, + wallet: str, animation1: Optional[str] = None, animation2: Optional[str] = None, animation3: Optional[str] = None, @@ -36,6 +37,7 @@ async def create_copilot( INSERT INTO copilots ( id, user, + wallet, title, animation1, animation2, @@ -52,11 +54,12 @@ async def create_copilot( lnurl_title, amount_made ) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) """, ( copilot_id, user, + wallet, title, animation1, animation2, diff --git a/lnbits/extensions/copilot/models.py b/lnbits/extensions/copilot/models.py index a49da089..42ecff5d 100644 --- a/lnbits/extensions/copilot/models.py +++ b/lnbits/extensions/copilot/models.py @@ -1,7 +1,7 @@ from sqlite3 import Row from typing import NamedTuple import time - +from quart import url_for from lnurl import Lnurl, encode as lnurl_encode # type: ignore from lnurl.types import LnurlPayMetadata # type: ignore from lnurl.models import LnurlPaySuccessAction, UrlAction # type: ignore @@ -35,5 +35,5 @@ class Copilots(NamedTuple): @property def lnurl(self) -> Lnurl: - url = url_for("copilots.lnurl_response", ls_id=self.id, _external=True) + url = url_for("copilot.lnurl_response", cp_id=self.id, _external=True) return lnurl_encode(url) \ No newline at end of file diff --git a/lnbits/extensions/copilot/templates/copilot/compose.html b/lnbits/extensions/copilot/templates/copilot/compose.html index 21da5c6d..87a695f4 100644 --- a/lnbits/extensions/copilot/templates/copilot/compose.html +++ b/lnbits/extensions/copilot/templates/copilot/compose.html @@ -14,12 +14,13 @@ class="fixed-bottom-right" > - + > ') diff --git a/lnbits/extensions/copilot/views_api.py b/lnbits/extensions/copilot/views_api.py index 85857809..959f875c 100644 --- a/lnbits/extensions/copilot/views_api.py +++ b/lnbits/extensions/copilot/views_api.py @@ -6,6 +6,8 @@ import httpx from lnbits.core.crud import get_user from lnbits.decorators import api_check_wallet_key, api_validate_post_request +from . import copilot_ext + from lnbits.extensions.copilot import copilot_ext from .crud import ( create_copilot,