diff --git a/lnbits/app.py b/lnbits/app.py index 65d63e67b..5167055b2 100644 --- a/lnbits/app.py +++ b/lnbits/app.py @@ -95,7 +95,7 @@ async def check_funding_source() -> None: original_sigint_handler = signal.getsignal(signal.SIGINT) def signal_handler(signal, frame): - logger.debug(f"SIGINT received, terminating LNbits.") + logger.debug("SIGINT received, terminating LNbits.") sys.exit(1) signal.signal(signal.SIGINT, signal_handler) diff --git a/lnbits/core/crud.py b/lnbits/core/crud.py index 16cde8356..183f663a0 100644 --- a/lnbits/core/crud.py +++ b/lnbits/core/crud.py @@ -702,7 +702,7 @@ async def delete_admin_settings(): async def update_admin_settings(data: EditableSettings): - await db.execute(f"UPDATE settings SET editable_settings = ?", (json.dumps(data),)) + await db.execute("UPDATE settings SET editable_settings = ?", (json.dumps(data),)) async def update_super_user(super_user: str): @@ -711,7 +711,7 @@ async def update_super_user(super_user: str): async def create_admin_settings(super_user: str, new_settings: dict): - sql = f"INSERT INTO settings (super_user, editable_settings) VALUES (?, ?)" + sql = "INSERT INTO settings (super_user, editable_settings) VALUES (?, ?)" await db.execute(sql, (super_user, json.dumps(new_settings))) return await get_super_settings() @@ -740,7 +740,7 @@ async def update_migration_version(conn, db_name, version): async def create_tinyurl(domain: str, endless: bool, wallet: str): tinyurl_id = shortuuid.uuid()[:8] await db.execute( - f"INSERT INTO tiny_url (id, url, endless, wallet) VALUES (?, ?, ?, ?)", + "INSERT INTO tiny_url (id, url, endless, wallet) VALUES (?, ?, ?, ?)", ( tinyurl_id, domain, @@ -753,7 +753,7 @@ async def create_tinyurl(domain: str, endless: bool, wallet: str): async def get_tinyurl(tinyurl_id: str) -> Optional[TinyURL]: row = await db.fetchone( - f"SELECT * FROM tiny_url WHERE id = ?", + "SELECT * FROM tiny_url WHERE id = ?", (tinyurl_id,), ) return TinyURL.from_row(row) if row else None @@ -761,7 +761,7 @@ async def get_tinyurl(tinyurl_id: str) -> Optional[TinyURL]: async def get_tinyurl_by_url(url: str) -> List[TinyURL]: rows = await db.fetchall( - f"SELECT * FROM tiny_url WHERE url = ?", + "SELECT * FROM tiny_url WHERE url = ?", (url,), ) return [TinyURL.from_row(row) for row in rows] @@ -769,6 +769,6 @@ async def get_tinyurl_by_url(url: str) -> List[TinyURL]: async def delete_tinyurl(tinyurl_id: str): await db.execute( - f"DELETE FROM tiny_url WHERE id = ?", + "DELETE FROM tiny_url WHERE id = ?", (tinyurl_id,), ) diff --git a/lnbits/core/services.py b/lnbits/core/services.py index 1e33cd470..adee88c99 100644 --- a/lnbits/core/services.py +++ b/lnbits/core/services.py @@ -229,7 +229,7 @@ async def pay_invoice( logger.debug(f"payment successful {payment.checking_id}") elif payment.checking_id is None and payment.ok is False: # payment failed - logger.warning(f"backend sent payment failure") + logger.warning("backend sent payment failure") async with db.connect() as conn: logger.debug(f"deleting temporary payment {temp_id}") await delete_wallet_payment(temp_id, wallet_id, conn=conn) @@ -431,7 +431,7 @@ async def check_admin_settings(): update_cached_settings(settings_db.dict()) # printing settings for debugging - logger.debug(f"Admin settings:") + logger.debug("Admin settings:") for key, value in settings.dict(exclude_none=True).items(): logger.debug(f"{key}: {value}") diff --git a/lnbits/extensions/boltcards/crud.py b/lnbits/extensions/boltcards/crud.py index 9c7d299d6..0a678e709 100644 --- a/lnbits/extensions/boltcards/crud.py +++ b/lnbits/extensions/boltcards/crud.py @@ -160,7 +160,7 @@ async def update_card_otp(otp: str, id: str): async def get_hit(hit_id: str) -> Optional[Hit]: - row = await db.fetchone(f"SELECT * FROM boltcards.hits WHERE id = ?", (hit_id,)) + row = await db.fetchone("SELECT * FROM boltcards.hits WHERE id = ?", (hit_id,)) if not row: return None @@ -183,7 +183,7 @@ async def get_hits(cards_ids: List[str]) -> List[Hit]: async def get_hits_today(card_id: str) -> List[Hit]: rows = await db.fetchall( - f"SELECT * FROM boltcards.hits WHERE card_id = ?", + "SELECT * FROM boltcards.hits WHERE card_id = ?", (card_id,), ) updatedrow = [] @@ -258,7 +258,7 @@ async def create_refund(hit_id, refund_amount) -> Refund: async def get_refund(refund_id: str) -> Optional[Refund]: row = await db.fetchone( - f"SELECT * FROM boltcards.refunds WHERE id = ?", (refund_id,) + "SELECT * FROM boltcards.refunds WHERE id = ?", (refund_id,) ) if not row: return None diff --git a/lnbits/extensions/boltcards/lnurl.py b/lnbits/extensions/boltcards/lnurl.py index d04303725..f5960d117 100644 --- a/lnbits/extensions/boltcards/lnurl.py +++ b/lnbits/extensions/boltcards/lnurl.py @@ -180,7 +180,7 @@ async def lnurlp_response(req: Request, hit_id: str = Query(None)): card = await get_card(hit.card_id) assert card if not hit: - return {"status": "ERROR", "reason": f"LNURL-pay record not found."} + return {"status": "ERROR", "reason": "LNURL-pay record not found."} if not card.enable: return {"status": "ERROR", "reason": "Card is disabled."} payResponse = { @@ -204,7 +204,7 @@ async def lnurlp_callback(hit_id: str = Query(None), amount: str = Query(None)): card = await get_card(hit.card_id) assert card if not hit: - return {"status": "ERROR", "reason": f"LNURL-pay record not found."} + return {"status": "ERROR", "reason": "LNURL-pay record not found."} _, payment_request = await create_invoice( wallet_id=card.wallet, diff --git a/lnbits/extensions/boltz/crud.py b/lnbits/extensions/boltz/crud.py index 1c9eb700a..5ad923f6d 100644 --- a/lnbits/extensions/boltz/crud.py +++ b/lnbits/extensions/boltz/crud.py @@ -32,7 +32,7 @@ async def get_submarine_swaps(wallet_ids: Union[str, List[str]]) -> List[Submari async def get_all_pending_submarine_swaps() -> List[SubmarineSwap]: rows = await db.fetchall( - f"SELECT * FROM boltz.submarineswap WHERE status='pending' order by time DESC", + "SELECT * FROM boltz.submarineswap WHERE status='pending' order by time DESC", ) return [SubmarineSwap(**row) for row in rows] @@ -107,7 +107,7 @@ async def get_reverse_submarine_swaps( async def get_all_pending_reverse_submarine_swaps() -> List[ReverseSubmarineSwap]: rows = await db.fetchall( - f"SELECT * FROM boltz.reverse_submarineswap WHERE status='pending' order by time DESC" + "SELECT * FROM boltz.reverse_submarineswap WHERE status='pending' order by time DESC" ) return [ReverseSubmarineSwap(**row) for row in rows] diff --git a/lnbits/extensions/boltz/tasks.py b/lnbits/extensions/boltz/tasks.py index 289332a20..63b981b1c 100644 --- a/lnbits/extensions/boltz/tasks.py +++ b/lnbits/extensions/boltz/tasks.py @@ -101,10 +101,10 @@ async def check_for_pending_swaps(): swaps = await get_all_pending_submarine_swaps() reverse_swaps = await get_all_pending_reverse_submarine_swaps() if len(swaps) > 0 or len(reverse_swaps) > 0: - logger.debug(f"Boltz - startup swap check") + logger.debug("Boltz - startup swap check") except: logger.error( - f"Boltz - startup swap check, database is not created yet, do nothing" + "Boltz - startup swap check, database is not created yet, do nothing" ) return diff --git a/lnbits/extensions/boltz/views_api.py b/lnbits/extensions/boltz/views_api.py index 72f66420d..ffec612c6 100644 --- a/lnbits/extensions/boltz/views_api.py +++ b/lnbits/extensions/boltz/views_api.py @@ -37,7 +37,7 @@ from .utils import check_balance, create_boltz_client, execute_reverse_swap @boltz_ext.get( "/api/v1/swap/mempool", - name=f"boltz.get /swap/mempool", + name="boltz.get /swap/mempool", summary="get a the mempool url", description=""" This endpoint gets the URL from mempool.space @@ -52,7 +52,7 @@ async def api_mempool_url(): # NORMAL SWAP @boltz_ext.get( "/api/v1/swap", - name=f"boltz.get /swap", + name="boltz.get /swap", summary="get a list of swaps a swap", description=""" This endpoint gets a list of normal swaps. @@ -74,7 +74,7 @@ async def api_submarineswap( @boltz_ext.post( "/api/v1/swap/refund", - name=f"boltz.swap_refund", + name="boltz.swap_refund", summary="refund of a swap", description=""" This endpoint attempts to refund a normal swaps, creates onchain tx and sets swap status ro refunded. @@ -122,7 +122,7 @@ async def api_submarineswap_refund(swap_id: str): @boltz_ext.post( "/api/v1/swap", status_code=status.HTTP_201_CREATED, - name=f"boltz.post /swap", + name="boltz.post /swap", summary="create a submarine swap", description=""" This endpoint creates a submarine swap @@ -164,7 +164,7 @@ async def api_submarineswap_create(data: CreateSubmarineSwap): # REVERSE SWAP @boltz_ext.get( "/api/v1/swap/reverse", - name=f"boltz.get /swap/reverse", + name="boltz.get /swap/reverse", summary="get a list of reverse swaps", description=""" This endpoint gets a list of reverse swaps. @@ -187,7 +187,7 @@ async def api_reverse_submarineswap( @boltz_ext.post( "/api/v1/swap/reverse", status_code=status.HTTP_201_CREATED, - name=f"boltz.post /swap/reverse", + name="boltz.post /swap/reverse", summary="create a reverse submarine swap", description=""" This endpoint creates a reverse submarine swap @@ -221,7 +221,7 @@ async def api_reverse_submarineswap_create( @boltz_ext.get( "/api/v1/swap/reverse/auto", - name=f"boltz.get /swap/reverse/auto", + name="boltz.get /swap/reverse/auto", summary="get a list of auto reverse swaps", description=""" This endpoint gets a list of auto reverse swaps. @@ -244,7 +244,7 @@ async def api_auto_reverse_submarineswap( @boltz_ext.post( "/api/v1/swap/reverse/auto", status_code=status.HTTP_201_CREATED, - name=f"boltz.post /swap/reverse/auto", + name="boltz.post /swap/reverse/auto", summary="create a auto reverse submarine swap", description=""" This endpoint creates a auto reverse submarine swap @@ -273,7 +273,7 @@ async def api_auto_reverse_submarineswap_create(data: CreateAutoReverseSubmarine @boltz_ext.delete( "/api/v1/swap/reverse/auto/{swap_id}", - name=f"boltz.delete /swap/reverse/auto", + name="boltz.delete /swap/reverse/auto", summary="delete a auto reverse submarine swap", description=""" This endpoint deletes a auto reverse submarine swap @@ -288,7 +288,7 @@ async def api_auto_reverse_submarineswap_delete(swap_id: str): @boltz_ext.post( "/api/v1/swap/status", - name=f"boltz.swap_status", + name="boltz.swap_status", summary="shows the status of a swap", description=""" This endpoint attempts to get the status of the swap. @@ -315,7 +315,7 @@ async def api_swap_status(swap_id: str): @boltz_ext.get( "/api/v1/swap/boltz", - name=f"boltz.get /swap/boltz", + name="boltz.get /swap/boltz", summary="get a boltz configuration", description=""" This endpoint gets configuration for boltz. (limits, fees...) diff --git a/lnbits/extensions/cashu/views_api.py b/lnbits/extensions/cashu/views_api.py index d896cf713..682412a4e 100644 --- a/lnbits/extensions/cashu/views_api.py +++ b/lnbits/extensions/cashu/views_api.py @@ -322,7 +322,7 @@ async def melt_coins( await pay_invoice( wallet_id=cashu.wallet, payment_request=invoice, - description=f"Pay cashu invoice", + description="Pay cashu invoice", extra={"tag": "cashu", "cashu_name": cashu.name}, ) except Exception as e: @@ -349,7 +349,7 @@ async def melt_coins( detail=f"Cashu: {str(e)}", ) finally: - logger.debug(f"Cashu: Unset pending") + logger.debug("Cashu: Unset pending") # delete proofs from pending list await ledger._unset_proofs_pending(proofs) diff --git a/lnbits/extensions/deezy/crud.py b/lnbits/extensions/deezy/crud.py index 1e1e285d5..38adc2666 100644 --- a/lnbits/extensions/deezy/crud.py +++ b/lnbits/extensions/deezy/crud.py @@ -7,7 +7,7 @@ from .models import BtcToLnSwap, LnToBtcSwap, Token, UpdateLnToBtcSwap async def get_ln_to_btc() -> List[LnToBtcSwap]: rows = await db.fetchall( - f"SELECT * FROM deezy.ln_to_btc_swap ORDER BY created_at DESC", + "SELECT * FROM deezy.ln_to_btc_swap ORDER BY created_at DESC", ) return [LnToBtcSwap(**row) for row in rows] @@ -16,7 +16,7 @@ async def get_ln_to_btc() -> List[LnToBtcSwap]: async def get_btc_to_ln() -> List[BtcToLnSwap]: rows = await db.fetchall( - f"SELECT * FROM deezy.btc_to_ln_swap ORDER BY created_at DESC", + "SELECT * FROM deezy.btc_to_ln_swap ORDER BY created_at DESC", ) return [BtcToLnSwap(**row) for row in rows] @@ -25,7 +25,7 @@ async def get_btc_to_ln() -> List[BtcToLnSwap]: async def get_token() -> Optional[Token]: row = await db.fetchone( - f"SELECT * FROM deezy.token ORDER BY created_at DESC", + "SELECT * FROM deezy.token ORDER BY created_at DESC", ) return Token(**row) if row else None diff --git a/lnbits/extensions/deezy/migrations.py b/lnbits/extensions/deezy/migrations.py index 67455d6b5..42c3973e9 100644 --- a/lnbits/extensions/deezy/migrations.py +++ b/lnbits/extensions/deezy/migrations.py @@ -15,7 +15,7 @@ async def m001_initial(db): """ ) await db.execute( - f""" + """ CREATE TABLE deezy.btc_to_ln_swap ( id TEXT PRIMARY KEY, ln_address TEXT NOT NULL, @@ -28,7 +28,7 @@ async def m001_initial(db): """ ) await db.execute( - f""" + """ CREATE TABLE deezy.token ( deezy_token TEXT NOT NULL, created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP diff --git a/lnbits/extensions/events/views_api.py b/lnbits/extensions/events/views_api.py index c21ccfa88..f27485d87 100644 --- a/lnbits/extensions/events/views_api.py +++ b/lnbits/extensions/events/views_api.py @@ -50,12 +50,12 @@ async def api_event_create( event = await get_event(event_id) if not event: raise HTTPException( - status_code=HTTPStatus.NOT_FOUND, detail=f"Event does not exist." + status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist." ) if event.wallet != wallet.wallet.id: raise HTTPException( - status_code=HTTPStatus.FORBIDDEN, detail=f"Not your event." + status_code=HTTPStatus.FORBIDDEN, detail="Not your event." ) event = await update_event(event_id, **data.dict()) else: @@ -69,11 +69,11 @@ async def api_form_delete(event_id, wallet: WalletTypeInfo = Depends(get_key_typ event = await get_event(event_id) if not event: raise HTTPException( - status_code=HTTPStatus.NOT_FOUND, detail=f"Event does not exist." + status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist." ) if event.wallet != wallet.wallet.id: - raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail=f"Not your event.") + raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail="Not your event.") await delete_event(event_id) await delete_event_tickets(event_id) @@ -101,7 +101,7 @@ async def api_ticket_make_ticket(event_id, name, email): event = await get_event(event_id) if not event: raise HTTPException( - status_code=HTTPStatus.NOT_FOUND, detail=f"Event does not exist." + status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist." ) try: payment_hash, payment_request = await create_invoice( @@ -121,7 +121,7 @@ async def api_ticket_send_ticket(event_id, payment_hash, data: CreateTicket): if not event: raise HTTPException( status_code=HTTPStatus.NOT_FOUND, - detail=f"Event could not be fetched.", + detail="Event could not be fetched.", ) status = await api_payment(payment_hash) @@ -141,7 +141,7 @@ async def api_ticket_send_ticket(event_id, payment_hash, data: CreateTicket): if not ticket: raise HTTPException( status_code=HTTPStatus.NOT_FOUND, - detail=f"Event could not be fetched.", + detail="Event could not be fetched.", ) return {"paid": True, "ticket_id": ticket.id} return {"paid": False} @@ -152,13 +152,11 @@ async def api_ticket_delete(ticket_id, wallet: WalletTypeInfo = Depends(get_key_ ticket = await get_ticket(ticket_id) if not ticket: raise HTTPException( - status_code=HTTPStatus.NOT_FOUND, detail=f"Ticket does not exist." + status_code=HTTPStatus.NOT_FOUND, detail="Ticket does not exist." ) if ticket.wallet != wallet.wallet.id: - raise HTTPException( - status_code=HTTPStatus.FORBIDDEN, detail=f"Not your ticket." - ) + raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail="Not your ticket.") await delete_ticket(ticket_id) return "", HTTPStatus.NO_CONTENT diff --git a/lnbits/extensions/gerty/migrations.py b/lnbits/extensions/gerty/migrations.py index afef2cfd8..75921a403 100644 --- a/lnbits/extensions/gerty/migrations.py +++ b/lnbits/extensions/gerty/migrations.py @@ -68,7 +68,7 @@ async def m006_add_gerty_model_col(db): """ await db.execute("ALTER TABLE gerty.mempool RENAME TO mempool_old") await db.execute( - f""" + """ CREATE TABLE gerty.mempool ( id TEXT PRIMARY KEY, mempool_endpoint TEXT NOT NULL, diff --git a/lnbits/extensions/invoices/crud.py b/lnbits/extensions/invoices/crud.py index 9a05f9c52..396528025 100644 --- a/lnbits/extensions/invoices/crud.py +++ b/lnbits/extensions/invoices/crud.py @@ -23,7 +23,7 @@ async def get_invoice(invoice_id: str) -> Optional[Invoice]: async def get_invoice_items(invoice_id: str) -> List[InvoiceItem]: rows = await db.fetchall( - f"SELECT * FROM invoices.invoice_items WHERE invoice_id = ?", (invoice_id,) + "SELECT * FROM invoices.invoice_items WHERE invoice_id = ?", (invoice_id,) ) return [InvoiceItem.from_row(row) for row in rows] @@ -54,7 +54,7 @@ async def get_invoices(wallet_ids: Union[str, List[str]]) -> List[Invoice]: async def get_invoice_payments(invoice_id: str) -> List[Payment]: rows = await db.fetchall( - f"SELECT * FROM invoices.payments WHERE invoice_id = ?", (invoice_id,) + "SELECT * FROM invoices.payments WHERE invoice_id = ?", (invoice_id,) ) return [Payment.from_row(row) for row in rows] diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py index c4c3cea55..b38da954b 100644 --- a/lnbits/extensions/lnaddress/lnurl.py +++ b/lnbits/extensions/lnaddress/lnurl.py @@ -39,7 +39,7 @@ async def lnurl_response(username: str, domain: str, request: Request): async def lnurl_callback(address_id, amount: int = Query(...)): address = await get_address(address_id) if not address: - return LnurlErrorResponse(reason=f"Address not found").dict() + return LnurlErrorResponse(reason="Address not found").dict() amount_received = amount diff --git a/lnbits/extensions/lnurldevice/lnurl.py b/lnbits/extensions/lnurldevice/lnurl.py index eba2a6930..b8098b40c 100644 --- a/lnbits/extensions/lnurldevice/lnurl.py +++ b/lnbits/extensions/lnurldevice/lnurl.py @@ -116,7 +116,7 @@ async def lnurl_v1_params( if switch[0] == gpio and switch[1] == profit and switch[2] == amount: check = True if not check: - return {"status": "ERROR", "reason": f"Switch params wrong"} + return {"status": "ERROR", "reason": "Switch params wrong"} lnurldevicepayment = await create_lnurldevicepayment( deviceid=device.id, @@ -226,7 +226,7 @@ async def lnurl_callback( ) if device.device == "atm": if lnurldevicepayment.payload == lnurldevicepayment.payhash: - return {"status": "ERROR", "reason": f"Payment already claimed"} + return {"status": "ERROR", "reason": "Payment already claimed"} if not pr: raise HTTPException( status_code=HTTPStatus.FORBIDDEN, detail="No payment request" @@ -240,7 +240,7 @@ async def lnurl_callback( if lnurldevicepayment.payload != k1: return {"status": "ERROR", "reason": "Bad K1"} if lnurldevicepayment.payhash != "payment_hash": - return {"status": "ERROR", "reason": f"Payment already claimed"} + return {"status": "ERROR", "reason": "Payment already claimed"} lnurldevicepayment_updated = await update_lnurldevicepayment( lnurldevicepayment_id=paymentid, payhash=lnurldevicepayment.payload diff --git a/lnbits/extensions/lnurlp/crud.py b/lnbits/extensions/lnurlp/crud.py index d5963b958..83607396f 100644 --- a/lnbits/extensions/lnurlp/crud.py +++ b/lnbits/extensions/lnurlp/crud.py @@ -10,7 +10,7 @@ async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink: link_id = urlsafe_short_hash()[:6] result = await db.execute( - f""" + """ INSERT INTO lnurlp.pay_links ( id, wallet, diff --git a/lnbits/extensions/market/crud.py b/lnbits/extensions/market/crud.py index 53a9afd5b..a7af6cde7 100644 --- a/lnbits/extensions/market/crud.py +++ b/lnbits/extensions/market/crud.py @@ -31,7 +31,7 @@ from .models import ( async def create_market_product(data: createProduct) -> Products: product_id = urlsafe_short_hash() await db.execute( - f""" + """ INSERT INTO market.products (id, stall, product, categories, description, image, price, quantity) VALUES (?, ?, ?, ?, ?, ?, ?, ?) """, @@ -93,7 +93,7 @@ async def delete_market_product(product_id: str) -> None: async def create_market_zone(user, data: createZones) -> Zones: zone_id = urlsafe_short_hash() await db.execute( - f""" + """ INSERT INTO market.zones ( id, "user", @@ -141,7 +141,7 @@ async def delete_market_zone(zone_id: str) -> None: async def create_market_stall(data: createStalls) -> Stalls: stall_id = urlsafe_short_hash() await db.execute( - f""" + """ INSERT INTO market.stalls ( id, wallet, @@ -255,7 +255,7 @@ async def create_market_order_details(order_id: str, data: List[createOrderDetai async def get_market_order_details(order_id: str) -> List[OrderDetail]: rows = await db.fetchall( - f"SELECT * FROM market.order_details WHERE order_id = ?", (order_id,) + "SELECT * FROM market.order_details WHERE order_id = ?", (order_id,) ) return [OrderDetail(**row) for row in rows] diff --git a/lnbits/extensions/market/views_api.py b/lnbits/extensions/market/views_api.py index effba7554..d6e28d269 100644 --- a/lnbits/extensions/market/views_api.py +++ b/lnbits/extensions/market/views_api.py @@ -309,7 +309,7 @@ async def api_market_order_create(data: createOrder): payment_hash, payment_request = await create_invoice( wallet_id=data.wallet, amount=data.total, - memo=f"New order on Market", + memo="New order on Market", extra={ "tag": "market", "reference": ref, diff --git a/lnbits/extensions/nostrnip5/crud.py b/lnbits/extensions/nostrnip5/crud.py index 66b9840b3..f7ec929c7 100644 --- a/lnbits/extensions/nostrnip5/crud.py +++ b/lnbits/extensions/nostrnip5/crud.py @@ -58,7 +58,7 @@ async def get_address_by_local_part( async def get_addresses(domain_id: str) -> List[Address]: rows = await db.fetchall( - f"SELECT * FROM nostrnip5.addresses WHERE domain_id = ?", (domain_id,) + "SELECT * FROM nostrnip5.addresses WHERE domain_id = ?", (domain_id,) ) return [Address.from_row(row) for row in rows] diff --git a/lnbits/extensions/scrub/migrations.py b/lnbits/extensions/scrub/migrations.py index f8f2ba43c..f1f4badef 100644 --- a/lnbits/extensions/scrub/migrations.py +++ b/lnbits/extensions/scrub/migrations.py @@ -3,7 +3,7 @@ async def m001_initial(db): Initial scrub table. """ await db.execute( - f""" + """ CREATE TABLE scrub.scrub_links ( id TEXT PRIMARY KEY, wallet TEXT NOT NULL, diff --git a/lnbits/extensions/smtp/crud.py b/lnbits/extensions/smtp/crud.py index 5dc384dc0..bc8d9e1a4 100644 --- a/lnbits/extensions/smtp/crud.py +++ b/lnbits/extensions/smtp/crud.py @@ -123,7 +123,7 @@ async def set_email_paid(payment_hash: str) -> bool: email = await get_email_by_payment_hash(payment_hash) if email and email.paid is False: await db.execute( - f"UPDATE smtp.email SET paid = true WHERE payment_hash = ?", (payment_hash,) + "UPDATE smtp.email SET paid = true WHERE payment_hash = ?", (payment_hash,) ) return True return False @@ -131,13 +131,13 @@ async def set_email_paid(payment_hash: str) -> bool: async def get_email_by_payment_hash(payment_hash: str) -> Optional[Email]: row = await db.fetchone( - f"SELECT * FROM smtp.email WHERE payment_hash = ?", (payment_hash,) + "SELECT * FROM smtp.email WHERE payment_hash = ?", (payment_hash,) ) return Email(**row) if row else None async def get_email(id: str) -> Optional[Email]: - row = await db.fetchone(f"SELECT * FROM smtp.email WHERE id = ?", (id,)) + row = await db.fetchone("SELECT * FROM smtp.email WHERE id = ?", (id,)) return Email(**row) if row else None diff --git a/lnbits/extensions/smtp/migrations.py b/lnbits/extensions/smtp/migrations.py index fbe77d73f..22500e106 100644 --- a/lnbits/extensions/smtp/migrations.py +++ b/lnbits/extensions/smtp/migrations.py @@ -36,4 +36,4 @@ async def m001_initial(db): async def m002_add_payment_hash(db): - await db.execute(f"ALTER TABLE smtp.email ADD COLUMN payment_hash TEXT;") + await db.execute("ALTER TABLE smtp.email ADD COLUMN payment_hash TEXT;") diff --git a/lnbits/extensions/watchonly/crud.py b/lnbits/extensions/watchonly/crud.py index 1d9abcec4..8472fa016 100644 --- a/lnbits/extensions/watchonly/crud.py +++ b/lnbits/extensions/watchonly/crud.py @@ -230,7 +230,7 @@ async def create_config(user: str) -> Config: async def update_config(config: Config, user: str) -> Optional[Config]: await db.execute( - f"""UPDATE watchonly.config SET json_data = ? WHERE "user" = ?""", + """UPDATE watchonly.config SET json_data = ? WHERE "user" = ?""", (json.dumps(config.dict()), user), ) row = await db.fetchone( diff --git a/lnbits/settings.py b/lnbits/settings.py index bc317e05a..3bec3f72a 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -366,7 +366,7 @@ except: # printing enviroment variable for debugging if not settings.lnbits_admin_ui: - logger.debug(f"Enviroment Settings:") + logger.debug("Enviroment Settings:") for key, value in settings.dict(exclude_none=True).items(): logger.debug(f"{key}: {value}")