From 6f06bcfb365afee16f4ed7f4c2295e5932f6da20 Mon Sep 17 00:00:00 2001 From: Arc <33088785+arcbtc@users.noreply.github.com> Date: Mon, 24 Feb 2020 16:05:24 +0000 Subject: [PATCH] Update views_api.py --- lnbits/extensions/withdraw/views_api.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lnbits/extensions/withdraw/views_api.py b/lnbits/extensions/withdraw/views_api.py index b5b387f..7bf9eb1 100644 --- a/lnbits/extensions/withdraw/views_api.py +++ b/lnbits/extensions/withdraw/views_api.py @@ -32,10 +32,9 @@ def api_lnurlencode(urlstr, parstr): url = url_for("withdraw.api_lnurlfetch", _external=True, urlstr=urlstr, parstr=parstr, rand=rand) if "onion" in url: - url.replace('http://', '') - url.replace('https://', '') - - return jsonify({"status": "TRUE", "lnurl": lnurl_encode(url.replace("http://", "https://"))}), 200 + return jsonify({"status": "TRUE", "lnurl": lnurl_encode(TorUrl(url))}), 200 + else: + return jsonify({"status": "TRUE", "lnurl": lnurl_encode(url.replace("http://", "https://"))}), 200 @withdraw_ext.route("/api/v1/lnurlfetch///", methods=["GET"]) @@ -55,11 +54,12 @@ def api_lnurlfetch(parstr, urlstr, rand): precallback=url_for("withdraw.api_lnurlwithdraw", _external=True, rand=rand) if "onion" in precallback: - precallback.replace('http://', '') - precallback.replace('https://', '') + precallback=TorUrl(precallback) + else: + precallback=precallback.replace("http://", "https://") res = LnurlWithdrawResponse( - callback=precallback.replace("http://", "https://"), + callback=precallback, k1=k1str, min_withdrawable=user_fau[0][8] * 1000, max_withdrawable=user_fau[0][7] * 1000, @@ -188,7 +188,8 @@ def api_lnurlmaker(): url = url_for("withdraw.api_lnurlfetch", _external=True, urlstr=request.host, parstr=uni, rand=rand) if "onion" in url: - url.replace('http://', '') - url.replace('https://', '') + return jsonify({"status": "TRUE", "lnurl": lnurl_encode(url.replace("http://", "https://"))}), 200 + else: + return jsonify({"status": "TRUE", "lnurl": lnurl_encode(TorUrl(url))}), 200 + - return jsonify({"status": "TRUE", "lnurl": lnurl_encode(url.replace("http://", "https://"))}), 200