From c0fc53028b655b1453dc97488f4cef8dbf27c107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Wed, 7 Dec 2022 11:02:23 +0100 Subject: [PATCH] reformatting --- lnbits/decorators.py | 6 +++--- lnbits/extensions/admin/crud.py | 7 ++++--- lnbits/extensions/admin/views_api.py | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lnbits/decorators.py b/lnbits/decorators.py index 761e93afd..0627d5030 100644 --- a/lnbits/decorators.py +++ b/lnbits/decorators.py @@ -146,7 +146,8 @@ async def get_key_type( status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist." ) if ( - wallet.wallet.user != settings.super_user and wallet.wallet.user not in settings.lnbits_admin_users + wallet.wallet.user != settings.super_user + and wallet.wallet.user not in settings.lnbits_admin_users ) and ( settings.lnbits_admin_extensions and pathname in settings.lnbits_admin_extensions @@ -256,6 +257,5 @@ async def check_admin(usr: UUID4) -> User: user.super_user = False if user.id == settings.super_user: user.super_user = True - - return user + return user diff --git a/lnbits/extensions/admin/crud.py b/lnbits/extensions/admin/crud.py index 88db5a0dc..ba9df604b 100644 --- a/lnbits/extensions/admin/crud.py +++ b/lnbits/extensions/admin/crud.py @@ -6,7 +6,7 @@ from lnbits.settings import readonly_variables, settings from lnbits.tasks import internal_invoice_queue from . import db -from .models import SuperSettings, AdminSettings, UpdateSettings +from .models import AdminSettings, SuperSettings, UpdateSettings async def update_wallet_balance(wallet_id: str, amount: int): @@ -39,12 +39,13 @@ async def get_admin_settings(is_super_user: bool = False) -> Optional[AdminSetti row_dict = dict(sets) row_dict.pop("super_user") admin_settings = AdminSettings( - super_user=is_super_user, lnbits_allowed_funding_sources=settings.lnbits_allowed_funding_sources, **row_dict + super_user=is_super_user, + lnbits_allowed_funding_sources=settings.lnbits_allowed_funding_sources, + **row_dict, ) return admin_settings - async def delete_admin_settings(): await db.execute("DELETE FROM admin.settings") diff --git a/lnbits/extensions/admin/views_api.py b/lnbits/extensions/admin/views_api.py index 3160c5596..c8bfba606 100644 --- a/lnbits/extensions/admin/views_api.py +++ b/lnbits/extensions/admin/views_api.py @@ -30,7 +30,7 @@ async def api_restart_server() -> dict[str, str]: @admin_ext.get("/api/v1/settings/") async def api_get_settings( - user: User = Depends(check_admin) #type: ignore + user: User = Depends(check_admin), # type: ignore ) -> Optional[AdminSettings]: admin_settings = await get_admin_settings(user.super_user) return admin_settings