From 2b21a4f47900597c6162e7b1d89d04af1a59f358 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@alhur.es>
Date: Thu, 6 May 2021 12:41:44 -0300
Subject: [PATCH] g.nursery -> current_app.nursery

---
 lnbits/app.py                | 4 ----
 lnbits/core/views/api.py     | 6 +++---
 lnbits/core/views/generic.py | 5 +++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lnbits/app.py b/lnbits/app.py
index cd700f5c..c5654f8e 100644
--- a/lnbits/app.py
+++ b/lnbits/app.py
@@ -114,10 +114,6 @@ def register_filters(app: QuartTrio):
 def register_request_hooks(app: QuartTrio):
     """Open the core db for each request so everything happens in a big transaction"""
 
-    @app.before_request
-    async def before_request():
-        g.nursery = app.nursery
-
     @app.after_request
     async def set_secure_headers(response):
         secure_headers.quart(response)
diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index 89330ab3..2547435e 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -3,7 +3,7 @@ import json
 import lnurl  # type: ignore
 import httpx
 from urllib.parse import urlparse, urlunparse, urlencode, parse_qs, ParseResult
-from quart import g, jsonify, make_response, url_for
+from quart import g, current_app, jsonify, make_response, url_for
 from http import HTTPStatus
 from binascii import unhexlify
 from typing import Dict, Union
@@ -310,8 +310,8 @@ async def api_payments_sse():
             await send_event.send(("keepalive", ""))
             await trio.sleep(25)
 
-    g.nursery.start_soon(payment_received)
-    g.nursery.start_soon(repeat_keepalive)
+    current_app.nursery.start_soon(payment_received)
+    current_app.nursery.start_soon(repeat_keepalive)
 
     async def send_events():
         try:
diff --git a/lnbits/core/views/generic.py b/lnbits/core/views/generic.py
index e17d71b3..f48b054f 100644
--- a/lnbits/core/views/generic.py
+++ b/lnbits/core/views/generic.py
@@ -2,6 +2,7 @@ from os import path
 from http import HTTPStatus
 from quart import (
     g,
+    current_app,
     abort,
     jsonify,
     request,
@@ -154,7 +155,7 @@ async def lnurl_full_withdraw_callback():
     async def pay():
         await pay_invoice(wallet_id=wallet.id, payment_request=pr)
 
-    g.nursery.start_soon(pay)
+    current_app.nursery.start_soon(pay)
 
     balance_notify = request.args.get("balanceNotify")
     if balance_notify:
@@ -197,7 +198,7 @@ async def lnurlwallet():
         user = await get_user(account.id, conn=conn)
         wallet = await create_wallet(user_id=user.id, conn=conn)
 
-    g.nursery.start_soon(
+    current_app.nursery.start_soon(
         redeem_lnurl_withdraw,
         wallet.id,
         request.args.get("lightning"),