use {"tag": ext} for extension-related payments.

lnbits/extensions/amilk/views_api.py

@@ -34,7 +34,9 @@ def api_amilkit(amilk_id):
     except LnurlException:
         abort(HTTPStatus.INTERNAL_SERVER_ERROR, "Could not process withdraw LNURL.")
 
-    payment_hash, payment_request = create_invoice(wallet_id=milk.wallet, amount=withdraw_res.max_sats, memo=memo)
+    payment_hash, payment_request = create_invoice(
+        wallet_id=milk.wallet, amount=withdraw_res.max_sats, memo=memo, extra={"tag": "amilk"}
+    )
 
     r = requests.get(
         withdraw_res.callback.base,

lnbits/extensions/events/views_api.py

@@ -109,10 +109,10 @@ def api_tickets():
 def api_ticket_make_ticket(event_id, sats):
     event = get_event(event_id)
     if not event:
-        return jsonify({"message": "LNTicket does not exist."}), HTTPStatus.NOT_FOUND
+        return jsonify({"message": "Event does not exist."}), HTTPStatus.NOT_FOUND
     try:
         payment_hash, payment_request = create_invoice(
-            wallet_id=event.wallet, amount=int(sats), memo=f"#lnticket {event_id}"
+            wallet_id=event.wallet, amount=int(sats), memo=f"{event_id}", extra={"tag": "events"}
         )
     except Exception as e:
         return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
@@ -120,7 +120,7 @@ def api_ticket_make_ticket(event_id, sats):
     ticket = create_ticket(payment_hash=payment_hash, wallet=event.wallet, event=event_id, **g.data)
 
     if not ticket:
-        return jsonify({"message": "LNTicket could not be fetched."}), HTTPStatus.NOT_FOUND
+        return jsonify({"message": "Event could not be fetched."}), HTTPStatus.NOT_FOUND
 
     return jsonify({"payment_hash": payment_hash, "payment_request": payment_request}), HTTPStatus.OK
 

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

@@ -106,15 +106,15 @@
     computed: {
       amountWords() {
         var regex = /\s+/gi
-        var char = this.formDialog.data.text
+        var nwords = this.formDialog.data.text
           .trim()
           .replace(regex, ' ')
           .split(' ').length
-        this.formDialog.data.sats = char * parseInt('{{ form_costpword }}')
-        if (this.formDialog.data.sats == parseInt('{{ form_costpword }}')) {
+        var sats = nwords * parseInt('{{ form_costpword }}')
+        if (sats === parseInt('{{ form_costpword }}')) {
           return '0 Sats to pay'
         } else {
-          return this.formDialog.data.sats + ' Sats to pay'
+          return sats + ' Sats to pay'
         }
       }
     },
@@ -125,7 +125,6 @@
         this.formDialog.data.name = ''
         this.formDialog.data.email = ''
         this.formDialog.data.text = ''
-        this.formDialog.data.sats = 0
       },
 
       closeReceiveDialog: function () {
@@ -139,15 +138,12 @@
         var self = this
         axios
           .post(
-            '/lnticket/api/v1/tickets/' +
-              '{{ form_id }}/' +
-              self.formDialog.data.sats,
+            '/lnticket/api/v1/tickets/{{ form_id }}',
             {
               form: '{{ form_id }}',
               name: self.formDialog.data.name,
               email: self.formDialog.data.email,
               ltext: self.formDialog.data.text,
-              sats: self.formDialog.data.sats
             }
           )
           .then(function (response) {
@@ -175,7 +171,6 @@
                     self.formDialog.data.name = ''
                     self.formDialog.data.email = ''
                     self.formDialog.data.text = ''
-                    self.formDialog.data.sats = 0
 
                     self.$q.notify({
                       type: 'positive',

lnbits/extensions/lnticket/views_api.py

@@ -1,3 +1,4 @@
+import re
 from flask import g, jsonify, request
 from http import HTTPStatus
 
@@ -48,7 +49,6 @@ def api_forms():
 def api_form_create(form_id=None):
     if form_id:
         form = get_form(form_id)
-        print(g.data)
 
         if not form:
             return jsonify({"message": "Form does not exist."}), HTTPStatus.NOT_FOUND
@@ -92,29 +92,32 @@ def api_tickets():
     return jsonify([form._asdict() for form in get_tickets(wallet_ids)]), HTTPStatus.OK
 
 
-@lnticket_ext.route("/api/v1/tickets/<form_id>/<sats>", methods=["POST"])
+@lnticket_ext.route("/api/v1/tickets/<form_id>", methods=["POST"])
 @api_validate_post_request(
     schema={
         "form": {"type": "string", "empty": False, "required": True},
         "name": {"type": "string", "empty": False, "required": True},
-        "email": {"type": "string", "empty": False, "required": True},
+        "email": {"type": "string", "empty": True, "required": True},
         "ltext": {"type": "string", "empty": False, "required": True},
-        "sats": {"type": "integer", "min": 0, "required": True},
     }
 )
-def api_ticket_make_ticket(form_id, sats):
-    event = get_form(form_id)
-
-    if not event:
+def api_ticket_make_ticket(form_id):
+    form = get_form(form_id)
+    if not form:
         return jsonify({"message": "LNTicket does not exist."}), HTTPStatus.NOT_FOUND
     try:
+        nwords = len(re.split(r"\s+", g.data["ltext"]))
+        sats = nwords * form.costpword
         payment_hash, payment_request = create_invoice(
-            wallet_id=event.wallet, amount=int(sats), memo=f"#lnticket {form_id}"
+            wallet_id=form.wallet,
+            amount=sats,
+            memo=f"ticket with {nwords} words on {form_id}",
+            extra={"tag": "lnticket"},
         )
     except Exception as e:
         return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
 
-    ticket = create_ticket(payment_hash=payment_hash, wallet=event.wallet, **g.data)
+    ticket = create_ticket(payment_hash=payment_hash, wallet=form.wallet, sats=sats, **g.data)
 
     if not ticket:
         return jsonify({"message": "LNTicket could not be fetched."}), HTTPStatus.NOT_FOUND

lnbits/extensions/lnurlp/views_api.py

@@ -123,6 +123,7 @@ def api_lnurl_callback(link_id):
         amount=link.amount,
         memo=link.description,
         description_hash=hashlib.sha256(link.lnurlpay_metadata.encode("utf-8")).digest(),
+        extra={"tag": "lnurlp"},
     )
     resp = LnurlPayActionResponse(pr=payment_request, success_action=None, routes=[])
 

lnbits/extensions/paywall/views_api.py

@@ -64,7 +64,7 @@ def api_paywall_create_invoice(paywall_id):
     try:
         amount = g.data["amount"] if g.data["amount"] > paywall.amount else paywall.amount
         payment_hash, payment_request = create_invoice(
-            wallet_id=paywall.wallet, amount=amount, memo=f"#paywall {paywall.memo}"
+            wallet_id=paywall.wallet, amount=amount, memo=f"{paywall.memo}", extra={'tag': 'paywall'}
         )
     except Exception as e:
         return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR

lnbits/extensions/tpos/views_api.py

@@ -60,7 +60,7 @@ def api_tpos_create_invoice(tpos_id):
 
     try:
         payment_hash, payment_request = create_invoice(
-            wallet_id=tpos.wallet, amount=g.data["amount"], memo=f"#tpos {tpos.name}"
+            wallet_id=tpos.wallet, amount=g.data["amount"], memo=f"{tpos.name}", extra={"tag": "tpos"}
         )
     except Exception as e:
         return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR

lnbits/extensions/withdraw/models.py

@@ -62,5 +62,5 @@ class WithdrawLink(NamedTuple):
             k1=self.k1,
             min_withdrawable=self.min_withdrawable * 1000,
             max_withdrawable=self.max_withdrawable * 1000,
-            default_description="#withdraw LNbits LNURL",
+            default_description="LNbits voucher",
         )

lnbits/extensions/withdraw/views_api.py

@@ -182,7 +182,12 @@ def api_lnurl_callback(unique_hash):
         return jsonify({"status": "ERROR", "reason": f"Wait {link.open_time - now} seconds."}), HTTPStatus.OK
 
     try:
-        pay_invoice(wallet_id=link.wallet, payment_request=payment_request, max_sat=link.max_withdrawable)
+        pay_invoice(
+            wallet_id=link.wallet,
+            payment_request=payment_request,
+            max_sat=link.max_withdrawable,
+            extra={"tag": "withdraw"},
+        )
 
         changes = {
             "open_time": link.wait_time + now,