pretty

Author: arcbtc

__init__.py

@@ -42,7 +42,7 @@ def tpos_start():
 __all__ = [
     "db",
     "tpos_ext",
-    "tpos_static_files",
     "tpos_start",
+    "tpos_static_files",
     "tpos_stop",
 ]

crud.py

@@ -3,9 +3,10 @@
 
 from lnbits.db import Database
 from lnbits.helpers import urlsafe_short_hash
+from loguru import logger
 
 from .models import CreateTposData, LnurlCharge, Tpos, TposClean
-from loguru import logger
+
 db = Database("ext_tpos")
 
 
@@ -85,5 +86,6 @@ async def get_tposs(wallet_ids: Union[str, list[str]]) -> list[Tpos]:
     logger.debug(tposs)
     return tposs
 
+
 async def delete_tpos(tpos_id: str) -> None:
     await db.execute("DELETE FROM tpos.pos WHERE id = :id", {"id": tpos_id})

helpers.py

@@ -2,6 +2,7 @@
 from lnbits.core.views.api import api_lnurlscan
 from loguru import logger
 
+
 async def get_pr(ln_address, amount):
     logger.debug(ln_address)
     logger.debug(amount)
@@ -10,10 +11,12 @@ async def get_pr(ln_address, amount):
         if data.get("status") == "ERROR":
             return
         async with httpx.AsyncClient() as client:
-            response = await client.get(url=f"{data['callback']}?amount={int(amount) * 1000}")
+            response = await client.get(
+                url=f"{data['callback']}?amount={int(amount) * 1000}"
+            )
             if response.status_code != 200:
                 logger.debug(response.status_code)
                 return
             return response.json()["pr"]
     except Exception:
-        return None
+        return None

migrations.py

@@ -166,6 +166,7 @@ async def m010_rename_tpos_withdraw_columns(db: Database):
     await db.execute("DROP TABLE tpos.pos")
     await db.execute("ALTER TABLE tpos.pos_backup RENAME TO pos")
 
+
 async def m011_lnaddress(db: Database):
     """
     Add lnaddress to tpos table
@@ -176,6 +177,7 @@ async def m011_lnaddress(db: Database):
     """
     )
 
+
 async def m012_addlnaddress(db: Database):
     """
     Add lnaddress_cut to tpos table
@@ -184,4 +186,4 @@ async def m012_addlnaddress(db: Database):
         """
         ALTER TABLE tpos.pos ADD lnaddress_cut TEXT NULL;
     """
-    )
+    )

models.py

@@ -95,9 +95,11 @@ class HashCheck(BaseModel):
 class PayLnurlWData(BaseModel):
     lnurl: str
 
+
 class LNaddress(BaseModel):
     lnaddress: str
 
+
 class Item(BaseModel):
     image: Optional[str]
     price: float

poetry.lock

@@ -7,6 +7,7 @@ authors = ["Alan Bits <[email protected]>"]
 [tool.poetry.dependencies]
 python = "^3.10 | ^3.9"
 lnbits = {version = "*",  allow-prereleases = true}
+mypy = "^1.13.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.3.0"

pyproject.toml

@@ -296,15 +296,19 @@ window.app = Vue.createApp({
         )
         .then(response => {
           if (response.data) {
-            this.$q.localStorage.set('tpos.lnaddress', this.lnaddressDialog.lnaddress);
+            this.$q.localStorage.set(
+              'tpos.lnaddress',
+              this.lnaddressDialog.lnaddress
+            )
             this.lnaddressDialog.show = false
             this.lnaddress = true
           }
         })
         .catch(error => {
-          const errorMessage = error.response?.data?.detail || "An unknown error occurred.";
-          LNbits.utils.notifyApiError(errorMessage);
-        });
+          const errorMessage =
+            error.response?.data?.detail || 'An unknown error occurred.'
+          LNbits.utils.notifyApiError(errorMessage)
+        })
     },
     atmGetWithdraw() {
       var dialog = this.invoiceDialog
@@ -467,13 +471,13 @@ window.app = Vue.createApp({
             }
           })
 
-            params.details = {
-              currency: this.currency,
-              exchangeRate: this.exchangeRate,
-              items: details,
-              taxIncluded: this.taxInclusive,
-              taxValue: this.cartTax
-            }
+          params.details = {
+            currency: this.currency,
+            exchangeRate: this.exchangeRate,
+            items: details,
+            taxIncluded: this.taxInclusive,
+            taxValue: this.cartTax
+          }
         }
         if (this.lnaddress) {
           params.user_lnaddress = this.lnaddressDialog.lnaddress
@@ -700,9 +704,9 @@ window.app = Vue.createApp({
     clearLNaddress() {
       this.$q.localStorage.remove('tpos.lnaddress')
       this.lnaddressDialog.lnaddress = ''
-      const url = new URL(window.location.href);
-      url.searchParams.delete('lnaddress');
-      window.history.replaceState({}, document.title, url.toString());
+      const url = new URL(window.location.href)
+      url.searchParams.delete('lnaddress')
+      window.history.replaceState({}, document.title, url.toString())
       this.lnaddressDialog.show = true
       this.lnaddress = false
     },
@@ -774,18 +778,20 @@ window.app = Vue.createApp({
       this.showPoS = false
       this.categories = this.extractCategories(this.items)
     }
-    if (this.tposLNaddress){
-      this.lnaddressDialog.lnaddress = this.$q.localStorage.getItem('tpos.lnaddress')
-      if(lnaddressparam != ""){
+    if (this.tposLNaddress) {
+      this.lnaddressDialog.lnaddress =
+        this.$q.localStorage.getItem('tpos.lnaddress')
+      if (lnaddressparam != '') {
         this.lnaddressDialog.lnaddress = lnaddressparam
-        this.$q.localStorage.set('tpos.lnaddress', this.lnaddressDialog.lnaddress);
+        this.$q.localStorage.set(
+          'tpos.lnaddress',
+          this.lnaddressDialog.lnaddress
+        )
         this.lnaddress = true
-      }
-      else if (!this.lnaddressDialog.lnaddress){
+      } else if (!this.lnaddressDialog.lnaddress) {
         this.lnaddress = false
         this.lnaddressDialog.show = true
-      }
-      else{
+      } else {
         this.lnaddress = true
       }
     }

static/js/tpos.js

@@ -3,9 +3,10 @@
 from lnbits.core.models import Payment
 from lnbits.core.services import create_invoice, pay_invoice, websocket_updater
 from lnbits.tasks import register_invoice_listener
-from .helpers import get_pr
 from loguru import logger
+
 from .crud import get_tpos
+from .helpers import get_pr
 
 
 async def wait_for_paid_invoices():
@@ -41,7 +42,7 @@ async def on_invoice_paid(payment: Payment) -> None:
     tpos = await get_tpos(tpos_id)
     assert tpos
     logger.debug(payment.extra.get("lnaddress"))
-    if (payment.extra.get("lnaddress") and payment.extra["lnaddress"] != ""):
+    if payment.extra.get("lnaddress") and payment.extra["lnaddress"] != "":
         logger.debug("poo")
         calc_amount = payment.amount - ((payment.amount / 100) * tpos.lnaddress_cut)
         logger.debug(calc_amount)
@@ -50,7 +51,7 @@ async def on_invoice_paid(payment: Payment) -> None:
         if pr:
             payment.extra["lnaddress"] = ""
             paid_payment = await pay_invoice(
-                payment_request = pr,
+                payment_request=pr,
                 wallet_id=payment.wallet_id,
                 extra={**payment.extra},
             )

tasks.py

@@ -200,11 +200,7 @@ <h5 class="q-mt-none q-mb-sm">
       </q-card-section>
       <q-card-section>
         <q-form autofocus @submit="lnaddressSubmit" class="q-gutter-md">
-          <q-input
-            filled
-            type="text"
-            v-model="lnaddressDialog.lnaddress"
-          >
+          <q-input filled type="text" v-model="lnaddressDialog.lnaddress">
           </q-input>
           <div>
             <q-btn label="Submit" type="submit" color="primary"></q-btn>

templates/tpos/dialogs.html

@@ -321,25 +321,27 @@ <h6 class="text-subtitle1 q-my-none">{{SITE_TITLE}} TPoS extension</h6>
               v-model="formDialog.data.lnaddress"
               label="LNaddress funding"
             >
-            <q-tooltip>
-              <span
-                v-text="'If enabled, the tpos can be funded with a LNaddress in the public page.'"
-              ></span></q-tooltip>
-          </q-checkbox>
+              <q-tooltip>
+                <span
+                  v-text="'If enabled, the tpos can be funded with a LNaddress in the public page.'"
+                ></span
+              ></q-tooltip>
+            </q-checkbox>
           </div>
           <div class="col">
             <q-input
-            filled
-          dense
+              filled
+              dense
               :disable="!formDialog.data.lnaddress"
               v-model="formDialog.data.lnaddress_cut"
               type="number"
               label="LNaddress cut 0-100 percent"
-            ><q-tooltip>
-              <span
-                v-text="'Percent charge for using the LNaddress funding option. To go to the TPoS wallet.'"
-              ></span></q-tooltip>
-          </q-input>
+              ><q-tooltip>
+                <span
+                  v-text="'Percent charge for using the LNaddress funding option. To go to the TPoS wallet.'"
+                ></span
+              ></q-tooltip>
+            </q-input>
           </div>
         </div>
         <div class="row">

templates/tpos/index.html

@@ -243,8 +243,8 @@ <h5>
           fab
           icon="cancel_schedule_send"
           color="primary"
-          
-        ><q-tooltip>Clear LNaddress</q-tooltip></q-btn>
+          ><q-tooltip>Clear LNaddress</q-tooltip></q-btn
+        >
       </q-page-sticky>
     </template>
     <template v-else>

templates/tpos/tpos.html

@@ -6,8 +6,9 @@
 from lnbits.decorators import check_user_exists
 from lnbits.helpers import template_renderer
 from lnbits.settings import settings
-from starlette.responses import HTMLResponse
 from loguru import logger
+from starlette.responses import HTMLResponse
+
 from .crud import get_clean_tpos, get_tpos
 from .models import TposClean