Merge pull request #5 from DoktorShift/update_v1

Fix LNURL callback - accept amount parameter from wallets


info modal enhancements

Author: DoktorShift

lnurl.py

@@ -109,23 +109,18 @@ async def lnurl_params(request: Request, device_id: str, switch_id: str):
 async def lnurl_callback(
     request: Request,
     paymentid: str,
-    pr: str = Query(None),
-    k1: str = Query(None),
+    amount: int = Query(..., description="Amount in millisatoshis"),
 ):
     payment = await get_payment(paymentid)
     if not payment:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="payment not found."
-        )
+        return {"status": "ERROR", "reason": "Payment not found."}
 
     if payment.payhash == "used":
         return {"status": "ERROR", "reason": "Payment already used."}
 
     device = await get_device(payment.deviceid)
     if not device:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="device not found."
-        )
+        return {"status": "ERROR", "reason": "Device not found."}
 
     switch = None
     for _switch in device.switches:
@@ -134,32 +129,37 @@ async def lnurl_callback(
             break
 
     if not switch:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="device switch not found."
+        return {"status": "ERROR", "reason": "Switch not found."}
+
+    # Validate amount matches expected
+    if amount != payment.sats:
+        return {"status": "ERROR", "reason": f"Amount mismatch. Expected {payment.sats} msats."}
+
+    try:
+        payment_hash, payment_request = await create_invoice(
+            wallet_id=device.wallet,
+            amount=int(amount / 1000),
+            memo=create_payment_memo(device, switch),
+            unhashed_description=json.dumps(
+                [["text/plain", create_payment_memo(device, switch)]]
+            ).encode(),
+            extra={
+                "tag": "DeviceTimer",
+                "Device": device.id,
+                "Switch": switch.id,
+                "amount": switch.amount,
+                "currency": device.currency,
+                "id": paymentid,
+                "received": False,
+                "fulfilled": False,
+            },
         )
 
-    payment_hash, payment_request = await create_invoice(
-        wallet_id=device.wallet,
-        amount=int(payment.sats / 1000),
-        memo=create_payment_memo(device, switch),
-        unhashed_description=json.dumps(
-            [["text/plain", create_payment_memo(device, switch)]]
-        ).encode(),
-        extra={
-            "tag": "DeviceTimer",
-            "Device": device.id,
-            "Switch": switch.id,
-            "amount": switch.amount,
-            "currency": device.currency,
-            "id": paymentid,
-            "received": False,
-            "fulfilled": False,
-        },
-    )
-
-    await update_payment(payment_id=paymentid, payhash=payment_hash)
+        await update_payment(payment_id=paymentid, payhash=payment_hash)
 
-    return {
-        "pr": payment_request,
-        "routes": [],
-    }
+        return {
+            "pr": payment_request,
+            "routes": [],
+        }
+    except Exception as e:
+        return {"status": "ERROR", "reason": str(e)}

static/js/index.js

@@ -79,6 +79,40 @@ window.app = Vue.createApp({
         switchCount: 0
       },
 
+      donationDialog: {
+        show: false,
+        address: 'u60311@blink.sv',
+        message: 'DeviceTimer extension donation',
+        selectedTier: null,
+        customAmount: null,
+        tiers: [
+          {
+            amount: 5000,
+            label: 'Coffee',
+            icon: 'local_cafe',
+            description: 'Buy us a coffee or sponsor us to keep us building new extensions'
+          },
+          {
+            amount: 50000,
+            label: 'Supporter',
+            icon: 'thumb_up',
+            description: 'Help cover server costs and testing hardware'
+          },
+          {
+            amount: 210000,
+            label: 'Believer',
+            icon: 'volunteer_activism',
+            description: 'Generous support for ongoing open source development'
+          },
+          {
+            amount: 1000000,
+            label: 'Sponsor',
+            icon: 'rocket_launch',
+            description: 'Fund the development of a brand new extension'
+          }
+        ]
+      },
+
       drawerRight: false
     }
   },
@@ -421,6 +455,49 @@ window.app = Vue.createApp({
       window.open('https://github.com/DoktorShift/DeviceTimer', '_blank')
     },
 
+    openDonationDialog() {
+      this.donationDialog.selectedTier = this.donationDialog.tiers[0]
+      this.donationDialog.customAmount = null
+      this.donationDialog.show = true
+    },
+
+    selectDonationTier(tier) {
+      this.donationDialog.selectedTier = tier
+      this.donationDialog.customAmount = null
+    },
+
+    selectCustomAmount() {
+      this.donationDialog.selectedTier = null
+    },
+
+    getDonationAmount() {
+      if (this.donationDialog.selectedTier) {
+        return this.donationDialog.selectedTier.amount
+      }
+      return this.donationDialog.customAmount || 0
+    },
+
+    getDonationQrUrl() {
+      const amount = this.getDonationAmount()
+      const address = this.donationDialog.address
+      if (amount > 0) {
+        return 'https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=' +
+          encodeURIComponent('lightning:' + address + '?amount=' + (amount * 1000))
+      }
+      return 'https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=' +
+        encodeURIComponent('lightning:' + address)
+    },
+
+    formatSats(amount) {
+      if (amount >= 1000000) {
+        return (amount / 1000000).toFixed(1).replace(/\.0$/, '') + 'M'
+      }
+      if (amount >= 1000) {
+        return (amount / 1000).toFixed(0) + 'k'
+      }
+      return amount.toString()
+    },
+
     isDeviceLive(deviceId) {
       return this.activeWebsocketDeviceId === deviceId && this.activeWebsocket !== null
     }