Merge branch 'main' into matthewcroughan/nixify

This commit is contained in:
ben
2022-07-23 20:09:24 +01:00
114 changed files with 1720 additions and 988 deletions
@@ -1,7 +1,8 @@
import httpx
import json
import os
import httpx
fiat_currencies = json.load(
open(
os.path.join(
+1 -2
View File
@@ -3,9 +3,8 @@ import math
import traceback
from http import HTTPStatus
from starlette.requests import Request
from loguru import logger
from starlette.requests import Request
from . import bleskomat_ext
from .crud import (
+2 -3
View File
@@ -3,13 +3,12 @@ import time
from typing import Dict
from fastapi.params import Query
from loguru import logger
from pydantic import BaseModel, validator
from starlette.requests import Request
from loguru import logger
from lnbits import bolt11
from lnbits.core.services import pay_invoice, PaymentFailure
from lnbits.core.services import PaymentFailure, pay_invoice
from . import db
from .exchange_rates import exchange_rate_providers, fiat_currencies
+1 -2
View File
@@ -1,9 +1,8 @@
from http import HTTPStatus
from fastapi import Depends, Query
from starlette.exceptions import HTTPException
from loguru import logger
from starlette.exceptions import HTTPException
from lnbits.core.crud import get_user
from lnbits.decorators import WalletTypeInfo, require_admin_key