Fixed some lnticket bugs

lnbits/extensions/lnticket/crud.py

@@ -46,7 +46,7 @@ async def set_ticket_paid(payment_hash: str) -> Tickets:
         amount = formdata.amountmade + row[7]
         await db.execute(
             """
-            UPDATE forms
+            UPDATE form
             SET amountmade = ?
             WHERE id = ?
             """,
@@ -80,14 +80,14 @@ async def delete_ticket(ticket_id: str) -> None:
 # FORMS
 
 
-async def create_form(*, wallet: str, name: str, description: str, costpword: int) -> Forms:
+async def create_form(*, wallet: str, name: str, webhook: Optional[str] = None, description: str, costpword: int) -> Forms:
     form_id = urlsafe_short_hash()
     await db.execute(
         """
-        INSERT INTO forms (id, wallet, name, description, costpword, amountmade)
-        VALUES (?, ?, ?, ?, ?, ?)
+        INSERT INTO form (id, wallet, name, webhook, description, costpword, amountmade)
+        VALUES (?, ?, ?, ?, ?, ?, ?)
         """,
-        (form_id, wallet, name, description, costpword, 0),
+        (form_id, wallet, name, webhook, description, costpword, 0),
     )
 
     form = await get_form(form_id)
@@ -97,14 +97,14 @@ async def create_form(*, wallet: str, name: str, description: str, costpword: in
 
 async def update_form(form_id: str, **kwargs) -> Forms:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(f"UPDATE forms SET {q} WHERE id = ?", (*kwargs.values(), form_id))
-    row = await db.fetchone("SELECT * FROM forms WHERE id = ?", (form_id,))
+    await db.execute(f"UPDATE form SET {q} WHERE id = ?", (*kwargs.values(), form_id))
+    row = await db.fetchone("SELECT * FROM form WHERE id = ?", (form_id,))
     assert row, "Newly updated form couldn't be retrieved"
     return Forms(**row)
 
 
 async def get_form(form_id: str) -> Optional[Forms]:
-    row = await db.fetchone("SELECT * FROM forms WHERE id = ?", (form_id,))
+    row = await db.fetchone("SELECT * FROM form WHERE id = ?", (form_id,))
     return Forms(**row) if row else None
 
 
@@ -113,10 +113,10 @@ async def get_forms(wallet_ids: Union[str, List[str]]) -> List[Forms]:
         wallet_ids = [wallet_ids]
 
     q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(f"SELECT * FROM forms WHERE wallet IN ({q})", (*wallet_ids,))
+    rows = await db.fetchall(f"SELECT * FROM form WHERE wallet IN ({q})", (*wallet_ids,))
 
     return [Forms(**row) for row in rows]
 
 
 async def delete_form(form_id: str) -> None:
-    await db.execute("DELETE FROM forms WHERE id = ?", (form_id,))
+    await db.execute("DELETE FROM form WHERE id = ?", (form_id,))

lnbits/extensions/lnticket/migrations.py

@@ -83,3 +83,56 @@ async def m002_changed(db):
             ),
         )
     await db.execute("DROP TABLE tickets")
+
+
+async def m003_changed(db):
+
+    await db.execute(
+        """
+        CREATE TABLE IF NOT EXISTS form (
+            id TEXT PRIMARY KEY,
+            wallet TEXT NOT NULL,
+            name TEXT NOT NULL,
+            webhook TEXT,
+            description TEXT NOT NULL,
+            costpword INTEGER NOT NULL,
+            amountmade INTEGER NOT NULL,
+            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+        );
+    """
+    )
+
+
+    for row in [list(row) for row in await db.fetchall("SELECT * FROM forms")]:
+        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 form (
+                id,
+                wallet,
+                name,
+                webhook,
+                description,
+                costpword,
+                amountmade
+            )
+            VALUES (?, ?, ?, ?, ?, ?, ?)
+            """,
+            (
+                row[0],
+                row[1],
+                row[2],
+                row[3],
+                row[4],
+                row[5],
+                row[6],
+            ),
+        )
+    await db.execute("DROP TABLE forms")

lnbits/extensions/lnticket/models.py

@@ -5,6 +5,7 @@ class Forms(NamedTuple):
     id: str
     wallet: str
     name: str
+    webhook: str
     description: str
     costpword: int
     amountmade: int

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

@@ -113,6 +113,7 @@
         if (sats === parseInt('{{ form_costpword }}')) {
           return '0 Sats to pay'
         } else {
+          this.formDialog.data.sats = sats
           return sats + ' Sats to pay'
         }
       }
@@ -140,7 +141,8 @@
             form: '{{ form_id }}',
             name: self.formDialog.data.name,
             email: self.formDialog.data.email,
-            ltext: self.formDialog.data.text
+            ltext: self.formDialog.data.text,
+            sats: self.formDialog.data.sats,
           })
           .then(function (response) {
             self.paymentReq = response.data.payment_request
@@ -162,12 +164,6 @@
                 .get('/lnticket/api/v1/tickets/' + self.paymentCheck)
                 .then(function (res) {
                   if (res.data.paid) {
-                    clearInterval(paymentChecker)
-                    dismissMsg()
-                    self.formDialog.data.name = ''
-                    self.formDialog.data.email = ''
-                    self.formDialog.data.text = ''
-
                     self.$q.notify({
                       type: 'positive',
                       message: 'Sent, thank you!',
@@ -178,12 +174,19 @@
                       status: 'complete',
                       paymentReq: null
                     }
+                    clearInterval(paymentChecker)
+                    dismissMsg()
+                    self.formDialog.data.name = ''
+                    self.formDialog.data.email = ''
+                    self.formDialog.data.text = ''
                   }
                 })
                 .catch(function (error) {
                   LNbits.utils.notifyApiError(error)
                 })
             }, 2000)
+
+
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)

lnbits/extensions/lnticket/templates/lnticket/index.html

@@ -114,7 +114,7 @@
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props">
+            <q-tr :props="props" v-if="props.row.paid">
               <q-td auto-width>
                 <q-btn
                   unelevated
@@ -181,6 +181,14 @@
           type="name"
           label="Form name "
         ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.trim="formDialog.data.webhook"
+          type="text"
+          label="Webhook (optional)"
+          hint="A URL to be called whenever this link receives a payment."
+        ></q-input>
         <q-input
           filled
           dense
@@ -244,6 +252,7 @@
             {name: 'id', align: 'left', label: 'ID', field: 'id'},
             {name: 'name', align: 'left', label: 'Name', field: 'name'},
             {name: 'wallet', align: 'left', label: 'Wallet', field: 'wallet'},
+            {name: 'webhook', align: 'left', label: 'Webhook', field: 'webhook'},
             {
               name: 'description',
               align: 'left',
@@ -255,12 +264,6 @@
               align: 'left',
               label: 'Cost Per Word',
               field: 'costpword'
-            },
-            {
-              name: 'amountmade',
-              align: 'left',
-              label: 'Amount Made',
-              field: 'amountmade'
             }
           ],
           pagination: {
@@ -269,11 +272,11 @@
         },
         ticketsTable: {
           columns: [
-            {name: 'id', align: 'left', label: 'ID', field: 'id'},
+            {name: 'form', align: 'left', label: 'Form', field: 'form'},
             {name: 'name', align: 'left', label: 'Name', field: 'name'},
             {name: 'email', align: 'left', label: 'Email', field: 'email'},
             {name: 'ltext', align: 'left', label: 'Ticket', field: 'ltext'},
-            {name: 'sats', align: 'left', label: 'Paid', field: 'sats'}
+            {name: 'sats', align: 'left', label: 'Cost', field: 'sats'}
           ],
           pagination: {
             rowsPerPage: 10

lnbits/extensions/lnticket/views_api.py

@@ -42,6 +42,7 @@ async def api_forms():
     schema={
         "wallet": {"type": "string", "empty": False, "required": True},
         "name": {"type": "string", "empty": False, "required": True},
+        "webhook": {"type": "string", "empty": False, "required": False},
         "description": {"type": "string", "min": 0, "required": True},
         "costpword": {"type": "integer", "min": 0, "required": True},
     }
@@ -99,6 +100,7 @@ async def api_tickets():
         "name": {"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},
     }
 )
 async def api_ticket_make_ticket(form_id):
@@ -107,7 +109,7 @@ async def api_ticket_make_ticket(form_id):
         return jsonify({"message": "LNTicket does not exist."}), HTTPStatus.NOT_FOUND
 
     nwords = len(re.split(r"\s+", g.data["ltext"]))
-    sats = nwords * form.costpword
+    sats = g.data["sats"]
     payment_hash, payment_request = await create_invoice(
         wallet_id=form.wallet,
         amount=sats,
@@ -115,7 +117,7 @@ async def api_ticket_make_ticket(form_id):
         extra={"tag": "lnticket"},
     )
 
-    ticket = await create_ticket(payment_hash=payment_hash, wallet=form.wallet, sats=sats, **g.data)
+    ticket = await create_ticket(payment_hash=payment_hash, wallet=form.wallet, **g.data)
 
     if not ticket:
         return jsonify({"message": "LNTicket could not be fetched."}), HTTPStatus.NOT_FOUND
@@ -130,7 +132,7 @@ async def api_ticket_send_ticket(payment_hash):
         status = await check_invoice_status(ticket.wallet, payment_hash)
         is_paid = not status.pending
     except Exception:
-        return jsonify({"message": "Not paid."}), HTTPStatus.NOT_FOUND
+        return jsonify({"paid": False}), HTTPStatus.OK
 
     if is_paid:
         wallet = await get_wallet(ticket.wallet)