From 9a9733c1ce9d3e79b375c4319072384ceb5c667c Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 29 Nov 2022 11:23:34 +0000
Subject: [PATCH] Auto stash before merge of "universalwebsocket" and
 "origin/universalwebsocket"

---
 lnbits/core/views/api.py | 47 ++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index 835967789..b7d83565a 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -11,10 +11,7 @@ from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
 
 import httpx
 import pyqrcode
-
-from fastapi import (Depends, Header, Query, Request, WebSocket,
-                     WebSocketDisconnect)
-
+from fastapi import Depends, Header, Query, Request, WebSocket, WebSocketDisconnect
 from fastapi.exceptions import HTTPException
 from fastapi.params import Body
 from loguru import logger
@@ -26,20 +23,42 @@ from starlette.responses import HTMLResponse, StreamingResponse
 import async_timeout
 from lnbits import bolt11, lnurl
 from lnbits.core.models import Payment, Wallet
-from lnbits.decorators import (WalletTypeInfo, get_key_type, require_admin_key,
-                               require_invoice_key)
+from lnbits.decorators import (
+    WalletTypeInfo,
+    get_key_type,
+    require_admin_key,
+    require_invoice_key,
+)
 from lnbits.helpers import url_for, urlsafe_short_hash
 from lnbits.settings import LNBITS_ADMIN_USERS, LNBITS_SITE_TITLE, WALLET
-from lnbits.utils.exchange_rates import (currencies, fiat_amount_as_satoshis,
-                                         satoshis_amount_as_fiat)
+from lnbits.utils.exchange_rates import (
+    currencies,
+    fiat_amount_as_satoshis,
+    satoshis_amount_as_fiat,
+)
 
 from .. import core_app, db
-from ..crud import (create_payment, get_payments, get_standalone_payment,
-                    get_total_balance, get_wallet, get_wallet_for_key,
-                    save_balance_check, update_payment_status, update_wallet)
-from ..services import (InvoiceFailure, PaymentFailure,
-                        check_transaction_status, create_invoice, pay_invoice,
-                        perform_lnurlauth, websocketManager, websocketUpdater)
+from ..crud import (
+    create_payment,
+    get_payments,
+    get_standalone_payment,
+    get_total_balance,
+    get_wallet,
+    get_wallet_for_key,
+    save_balance_check,
+    update_payment_status,
+    update_wallet,
+)
+from ..services import (
+    InvoiceFailure,
+    PaymentFailure,
+    check_transaction_status,
+    create_invoice,
+    pay_invoice,
+    perform_lnurlauth,
+    websocketManager,
+    websocketUpdater,
+)
 from ..tasks import api_invoice_listeners