highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-09-25 19:36:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1648 from lnbits/typeignore-generic

Browse Source 
removing type ignores from views/generic.py
This commit is contained in:
Arc
2023-05-02 14:50:00 +01:00
committed by GitHub
parent 67c377affc 21157fffe2
commit bc2c5fd1a9
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lnbits/core/views/generic.py
View File

@@ -68,7 +68,9 @@ async def extensions(
# Update user as his extensions have been updated # Update user as his extensions have been updated
if enable or disable: if enable or disable:
user = await get_user(user.id) # type: ignore updated_user = await get_user(user.id)
assert updated_user, "User does not exist."
user = updated_user
return template_renderer().TemplateResponse( return template_renderer().TemplateResponse(
"core/extensions.html", {"request": request, "user": user.dict()} "core/extensions.html", {"request": request, "user": user.dict()}
@@ -186,8 +188,10 @@ async def wallet(
wallet_name = nme wallet_name = nme
if not user_id: if not user_id:
user = await get_user((await create_account()).id) new_user = await create_account()
logger.info(f"Create user {user.id}") # type: ignore user = await get_user(new_user.id)
assert user, "Newly created user has to exist."
logger.info(f"Create user {user.id}")
else: else:
user = await get_user(user_id) user = await get_user(user_id)
if not user: if not user:
@@ -209,23 +213,23 @@ async def wallet(
user.super_user = True user.super_user = True
if not wallet_id: if not wallet_id:
if user.wallets and not wallet_name: # type: ignore if user.wallets and not wallet_name:
wallet = user.wallets[0] # type: ignore wallet = user.wallets[0]
else: else:
wallet = await create_wallet(user_id=user.id, wallet_name=wallet_name) # type: ignore wallet = await create_wallet(user_id=user.id, wallet_name=wallet_name)
logger.info( logger.info(
f"Created new wallet {wallet_name if wallet_name else '(no name)'} for user {user.id}" # type: ignore f"Created new wallet {wallet_name if wallet_name else '(no name)'} for user {user.id}"
) )
return RedirectResponse( return RedirectResponse(
f"/wallet?usr={user.id}&wal={wallet.id}", # type: ignore f"/wallet?usr={user.id}&wal={wallet.id}",
status_code=status.HTTP_307_TEMPORARY_REDIRECT, status_code=status.HTTP_307_TEMPORARY_REDIRECT,
) )
logger.debug( logger.debug(
f"Access {'user '+ user.id + ' ' if user else ''} {'wallet ' + wallet_name if wallet_name else ''}" f"Access {'user '+ user.id + ' ' if user else ''} {'wallet ' + wallet_name if wallet_name else ''}"
) )
userwallet = user.get_wallet(wallet_id) # type: ignore userwallet = user.get_wallet(wallet_id)
if not userwallet: if not userwallet:
return template_renderer().TemplateResponse( return template_renderer().TemplateResponse(
"error.html", {"request": request, "err": "Wallet not found"} "error.html", {"request": request, "err": "Wallet not found"}
@@ -235,10 +239,10 @@ async def wallet(
"core/wallet.html", "core/wallet.html",
{ {
"request": request, "request": request,
"user": user.dict(), # type: ignore "user": user.dict(),
"wallet": userwallet.dict(), "wallet": userwallet.dict(),
"service_fee": settings.lnbits_service_fee, "service_fee": settings.lnbits_service_fee,
"web_manifest": f"/manifest/{user.id}.webmanifest", # type: ignore "web_manifest": f"/manifest/{user.id}.webmanifest",
}, },
) )
@@ -294,18 +298,21 @@ async def lnurl_full_withdraw_callback(request: Request):
@core_html_routes.get("/deletewallet", response_class=RedirectResponse) @core_html_routes.get("/deletewallet", response_class=RedirectResponse)
async def deletewallet(wal: str = Query(...), usr: str = Query(...)): async def deletewallet(wal: str = Query(...), usr: str = Query(...)):
user = await get_user(usr) user = await get_user(usr)
user_wallet_ids = [u.id for u in user.wallets] # type: ignore if not user:
raise HTTPException(HTTPStatus.FORBIDDEN, "User not found.")
user_wallet_ids = [u.id for u in user.wallets]
if wal not in user_wallet_ids: if wal not in user_wallet_ids:
raise HTTPException(HTTPStatus.FORBIDDEN, "Not your wallet.") raise HTTPException(HTTPStatus.FORBIDDEN, "Not your wallet.")
else: else:
await delete_wallet(user_id=user.id, wallet_id=wal) # type: ignore await delete_wallet(user_id=user.id, wallet_id=wal)
user_wallet_ids.remove(wal) user_wallet_ids.remove(wal)
logger.debug("Deleted wallet {wal} of user {user.id}") logger.debug("Deleted wallet {wal} of user {user.id}")
if user_wallet_ids: if user_wallet_ids:
return RedirectResponse( return RedirectResponse(
url_for("/wallet", usr=user.id, wal=user_wallet_ids[0]), # type: ignore url_for("/wallet", usr=user.id, wal=user_wallet_ids[0]),
status_code=status.HTTP_307_TEMPORARY_REDIRECT, status_code=status.HTTP_307_TEMPORARY_REDIRECT,
) )
@@ -328,7 +335,8 @@ async def lnurlwallet(request: Request):
async with db.connect() as conn: async with db.connect() as conn:
account = await create_account(conn=conn) account = await create_account(conn=conn)
user = await get_user(account.id, conn=conn) user = await get_user(account.id, conn=conn)
wallet = await create_wallet(user_id=user.id, conn=conn) # type: ignore assert user, "Newly created user not found."
wallet = await create_wallet(user_id=user.id, conn=conn)
asyncio.create_task( asyncio.create_task(
redeem_lnurl_withdraw( redeem_lnurl_withdraw(
@@ -341,7 +349,7 @@ async def lnurlwallet(request: Request):
) )
return RedirectResponse( return RedirectResponse(
f"/wallet?usr={user.id}&wal={wallet.id}", # type: ignore f"/wallet?usr={user.id}&wal={wallet.id}",
status_code=status.HTTP_307_TEMPORARY_REDIRECT, status_code=status.HTTP_307_TEMPORARY_REDIRECT,
) )