From 76438f556350e54da56a0479f64dd342ec462707 Mon Sep 17 00:00:00 2001 From: Fitti Date: Tue, 22 Jun 2021 15:46:46 +0200 Subject: [PATCH] Make CamelCase lowercase --- lnbits/extensions/TwitchAlerts/__init__.py | 6 +++--- lnbits/extensions/TwitchAlerts/crud.py | 2 +- .../{TwitchAlerts => twitchalerts}/index.html | 2 +- lnbits/extensions/TwitchAlerts/views.py | 6 +++--- lnbits/extensions/TwitchAlerts/views_api.py | 16 ++++++++-------- 5 files changed, 16 insertions(+), 16 deletions(-) rename lnbits/extensions/TwitchAlerts/templates/{TwitchAlerts => twitchalerts}/index.html (97%) diff --git a/lnbits/extensions/TwitchAlerts/__init__.py b/lnbits/extensions/TwitchAlerts/__init__.py index c31c5628..c839c292 100644 --- a/lnbits/extensions/TwitchAlerts/__init__.py +++ b/lnbits/extensions/TwitchAlerts/__init__.py @@ -1,10 +1,10 @@ from quart import Blueprint from lnbits.db import Database -db = Database("ext_TwitchAlerts") +db = Database("ext_twitchalerts") -TwitchAlerts_ext: Blueprint = Blueprint( - "TwitchAlerts", __name__, static_folder="static", template_folder="templates" +twitchalerts_ext: Blueprint = Blueprint( + "twitchalerts", __name__, static_folder="static", template_folder="templates" ) diff --git a/lnbits/extensions/TwitchAlerts/crud.py b/lnbits/extensions/TwitchAlerts/crud.py index a7024ad8..fb3a64de 100644 --- a/lnbits/extensions/TwitchAlerts/crud.py +++ b/lnbits/extensions/TwitchAlerts/crud.py @@ -137,7 +137,7 @@ async def authenticate_service(service_id, code, redirect_uri): print(response) token = response['access_token'] await service_add_token(service_id, token) - return f"/TwitchAlerts/?usr={user}" + return f"/twitchalerts/?usr={user}" async def service_add_token(service_id, token): diff --git a/lnbits/extensions/TwitchAlerts/templates/TwitchAlerts/index.html b/lnbits/extensions/TwitchAlerts/templates/twitchalerts/index.html similarity index 97% rename from lnbits/extensions/TwitchAlerts/templates/TwitchAlerts/index.html rename to lnbits/extensions/TwitchAlerts/templates/twitchalerts/index.html index e78e07bc..ac30a196 100644 --- a/lnbits/extensions/TwitchAlerts/templates/TwitchAlerts/index.html +++ b/lnbits/extensions/TwitchAlerts/templates/twitchalerts/index.html @@ -44,7 +44,7 @@ // axios is available for making requests axios({ method: 'GET', - url: '/TwitchAlerts/api/v1/tools', + url: '/twitchalerts/api/v1/tools', headers: { 'X-TwitchAlerts-header': 'not-used' } diff --git a/lnbits/extensions/TwitchAlerts/views.py b/lnbits/extensions/TwitchAlerts/views.py index f080a62e..dd99ae85 100644 --- a/lnbits/extensions/TwitchAlerts/views.py +++ b/lnbits/extensions/TwitchAlerts/views.py @@ -2,11 +2,11 @@ from quart import g, render_template from lnbits.decorators import check_user_exists, validate_uuids -from . import TwitchAlerts_ext +from . import twitchalerts_ext -@TwitchAlerts_ext.route("/") +@twitchalerts_ext.route("/") @validate_uuids(["usr"], required=True) @check_user_exists() async def index(): - return await render_template("TwitchAlerts/index.html", user=g.user) + return await render_template("twitchalerts/index.html", user=g.user) diff --git a/lnbits/extensions/TwitchAlerts/views_api.py b/lnbits/extensions/TwitchAlerts/views_api.py index 75b654fc..893b53e8 100644 --- a/lnbits/extensions/TwitchAlerts/views_api.py +++ b/lnbits/extensions/TwitchAlerts/views_api.py @@ -3,7 +3,7 @@ from http import HTTPStatus from lnbits.decorators import api_validate_post_request, api_check_wallet_key -from . import TwitchAlerts_ext +from . import twitchalerts_ext from .crud import ( get_charge_details, create_donation, @@ -14,7 +14,7 @@ from .crud import ( from ..satspay.crud import create_charge, get_charge -@TwitchAlerts_ext.route("/api/v1/createservice", methods=["POST"]) +@twitchalerts_ext.route("/api/v1/createservice", methods=["POST"]) @api_check_wallet_key("invoice") @api_validate_post_request( schema={ @@ -30,20 +30,20 @@ async def api_create_service(): """Create a service, which holds data about how/where to post donations""" service = await create_service(**g.data) redirect_url = request.scheme + "://" + request.headers["Host"] - redirect_url += f"/TwitchAlerts/?created={str(service.id)}" + redirect_url += f"/twitchalerts/?created={str(service.id)}" return redirect(redirect_url) -@TwitchAlerts_ext.route("/api/v1/authenticate/", methods=["GET"]) +@twitchalerts_ext.route("/api/v1/authenticate/", methods=["GET"]) async def api_authenticate_service(service_id): code = request.args.get('code') redirect_uri = request.scheme + "://" + request.headers["Host"] - redirect_uri += f"/TwitchAlerts/api/v1/authenticate/{service_id}" + redirect_uri += f"/twitchalerts/api/v1/authenticate/{service_id}" url = await authenticate_service(service_id, code, redirect_uri) return redirect(url) -@TwitchAlerts_ext.route("/api/v1/createdonation", methods=["POST"]) +@twitchalerts_ext.route("/api/v1/createdonation", methods=["POST"]) @api_check_wallet_key("invoice") @api_validate_post_request( schema={ @@ -63,7 +63,7 @@ async def api_create_donation(): amount=g.data["sats"], completelink="https://twitch.tv/Fitti", completelinktext="Back to Stream!", - webhook=webhook_base + "/TwitchAlerts/api/v1/postdonation", + webhook=webhook_base + "/twitchalerts/api/v1/postdonation", **charge_details) await create_donation( id=charge.id, @@ -76,7 +76,7 @@ async def api_create_donation(): return redirect(f"/satspay/{charge.id}") -@TwitchAlerts_ext.route("/api/v1/postdonation", methods=["POST"]) +@twitchalerts_ext.route("/api/v1/postdonation", methods=["POST"]) # @api_validate_post_request( # schema={ # "id": {"type": "string", "required": True},