Merge branch 'main' into matthewcroughan/nixify

lnbits/extensions/lnurlp/crud.py

@@ -1,8 +1,9 @@
 from typing import List, Optional, Union
 
 from lnbits.db import SQLITE
+
 from . import db
-from .models import PayLink, CreatePayLinkData
+from .models import CreatePayLinkData, PayLink
 
 
 async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink:

lnbits/extensions/lnurlp/models.py

@@ -1,12 +1,14 @@
 import json
-from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
-from starlette.requests import Request
-from fastapi.param_functions import Query
-from typing import Optional, Dict
-from lnbits.lnurl import encode as lnurl_encode  # type: ignore
-from lnurl.types import LnurlPayMetadata  # type: ignore
 from sqlite3 import Row
+from typing import Dict, Optional
+from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+
+from fastapi.param_functions import Query
+from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
+from starlette.requests import Request
+
+from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class CreatePayLinkData(BaseModel):

lnbits/extensions/lnurlp/static/js/index.js

@@ -35,6 +35,7 @@ new Vue({
           rowsPerPage: 10
         }
       },
+      nfcTagWriting: false,
       formDialog: {
         show: false,
         fixedAmount: true,
@@ -205,6 +206,42 @@ new Vue({
         .catch(err => {
           LNbits.utils.notifyApiError(err)
         })
+    },
+    writeNfcTag: async function (lnurl) {
+      try {
+        if (typeof NDEFReader == 'undefined') {
+          throw {
+            toString: function () {
+              return 'NFC not supported on this device or browser.'
+            }
+          }
+        }
+
+        const ndef = new NDEFReader()
+
+        this.nfcTagWriting = true
+        this.$q.notify({
+          message: 'Tap your NFC tag to write the LNURL-pay link to it.'
+        })
+
+        await ndef.write({
+          records: [{recordType: 'url', data: 'lightning:' + lnurl, lang: 'en'}]
+        })
+
+        this.nfcTagWriting = false
+        this.$q.notify({
+          type: 'positive',
+          message: 'NFC tag written successfully.'
+        })
+      } catch (error) {
+        this.nfcTagWriting = false
+        this.$q.notify({
+          type: 'negative',
+          message: error
+            ? error.toString()
+            : 'An unexpected error has occurred.'
+        })
+      }
     }
   },
   created() {

lnbits/extensions/lnurlp/tasks.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+
 import httpx
 
 from lnbits.core import db as core_db
@@ -19,7 +20,7 @@ async def wait_for_paid_invoices():
 
 
 async def on_invoice_paid(payment: Payment) -> None:
-    if "lnurlp" != payment.extra.get("tag"):
+    if payment.extra.get("tag") != "lnurlp":
         # not an lnurlp invoice
         return
 

lnbits/extensions/lnurlp/templates/lnurlp/display.html

@@ -14,10 +14,17 @@
             </q-responsive>
           </a>
         </div>
-        <div class="row q-mt-lg">
+        <div class="row q-mt-lg q-gutter-sm">
           <q-btn outline color="grey" @click="copyText('{{ lnurl }}')"
             >Copy LNURL</q-btn
           >
+          <q-btn
+            outline
+            color="grey"
+            icon="nfc"
+            @click="writeNfcTag(' {{ lnurl }} ')"
+            :disable="nfcTagWriting"
+          ></q-btn>
         </div>
       </q-card-section>
     </q-card>

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

@@ -99,7 +99,8 @@
                   @click="openUpdateDialog(props.row.id)"
                   icon="edit"
                   color="light-blue"
-                ></q-btn>
+                >
+                </q-btn>
                 <q-btn
                   flat
                   dense
@@ -153,7 +154,8 @@
           v-model.trim="formDialog.data.description"
           type="text"
           label="Item description *"
-        ></q-input>
+        >
+        </q-input>
         <div class="row q-col-gutter-sm">
           <q-input
             filled
@@ -171,7 +173,8 @@
             type="number"
             :step="formDialog.data.currency && formDialog.data.currency !== 'satoshis' ? '0.01' : '1'"
             label="Max *"
-          ></q-input>
+          >
+          </q-input>
         </div>
         <div class="row q-col-gutter-sm">
           <div class="col">
@@ -200,7 +203,8 @@
           type="number"
           label="Comment maximum characters"
           hint="Tell wallets to prompt users for a comment that will be sent along with the payment. LNURLp will store the comment and send it in the webhook."
-        ></q-input>
+        >
+        </q-input>
         <q-input
           filled
           dense
@@ -224,7 +228,8 @@
           type="text"
           label="Success URL (optional)"
           hint="Will be shown as a clickable link to the user in his wallet after a successful payment, appended by the payment_hash as a query string."
-        ></q-input>
+        >
+        </q-input>
         <div class="row q-mt-lg">
           <q-btn
             v-if="formDialog.data.id"
@@ -294,6 +299,14 @@
           @click="copyText(qrCodeDialog.data.pay_url, 'Link copied to clipboard!')"
           >Shareable link</q-btn
         >
+        <q-btn
+          outline
+          color="grey"
+          icon="nfc"
+          @click="writeNfcTag(qrCodeDialog.data.lnurl)"
+          :disable="nfcTagWriting"
+        >
+        </q-btn>
         <q-btn
           outline
           color="grey"

lnbits/extensions/lnurlp/views_api.py

@@ -73,6 +73,7 @@ async def api_link_retrieve(
 @lnurlp_ext.put("/api/v1/links/{link_id}", status_code=HTTPStatus.OK)
 async def api_link_create_or_update(
     data: CreatePayLinkData,
+    request: Request,
     link_id=None,
     wallet: WalletTypeInfo = Depends(get_key_type),
 ):
@@ -117,7 +118,7 @@ async def api_link_create_or_update(
         link = await update_pay_link(**data.dict(), link_id=link_id)
     else:
         link = await create_pay_link(data, wallet_id=wallet.wallet.id)
-    return {**link.dict(), "lnurl": link.lnurl}
+    return {**link.dict(), "lnurl": link.lnurl(request)}
 
 
 @lnurlp_ext.delete("/api/v1/links/{link_id}")