From 2ee7b8951d3c89e6cce45aff48ca0a133e65d9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Sun, 29 Sep 2024 22:44:29 +0200 Subject: [PATCH] backwards compatible --- lnbits/core/crud.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lnbits/core/crud.py b/lnbits/core/crud.py index b1752eaee..99e61a4d5 100644 --- a/lnbits/core/crud.py +++ b/lnbits/core/crud.py @@ -1,7 +1,7 @@ import json from datetime import datetime from time import time -from typing import Literal, Optional +from typing import Literal, Optional, Union from uuid import uuid4 import shortuuid @@ -236,7 +236,15 @@ async def get_account_by_username_or_email( ) -async def get_user(account: Account, conn: Optional[Connection] = None) -> User: +async def get_user( + account_or_id: Union[Account, str], conn: Optional[Connection] = None +) -> Optional[User]: + if isinstance(account_or_id, str): + account = await get_account(account_or_id, conn) + if not account: + return None + else: + account = account_or_id extensions = await get_user_active_extensions_ids(account.id, conn) wallets = await get_wallets(account.id, conn) return User(