Merge remote-tracking branch 'origin/main' into diagon-alley

lnbits/extensions/lnurlp/crud.py

@@ -9,11 +9,6 @@ async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink:
 
     returning = "" if db.type == SQLITE else "RETURNING ID"
     method = db.execute if db.type == SQLITE else db.fetchone
-    # database only allows int4 entries for min and max. For fiat currencies,
-    # we multiply by data.fiat_base_multiplier (usually 100) to save the value in cents.
-    if data.currency and data.fiat_base_multiplier:
-        data.min *= data.fiat_base_multiplier
-        data.max *= data.fiat_base_multiplier
 
     result = await (method)(
         f"""

lnbits/extensions/lnurlp/views_api.py

@@ -89,6 +89,12 @@ async def api_link_create_or_update(
             detail="Must use full satoshis.", status_code=HTTPStatus.BAD_REQUEST
         )
 
+    # database only allows int4 entries for min and max. For fiat currencies,
+    # we multiply by data.fiat_base_multiplier (usually 100) to save the value in cents.
+    if data.currency and data.fiat_base_multiplier:
+        data.min *= data.fiat_base_multiplier
+        data.max *= data.fiat_base_multiplier
+
     if "success_url" in data and data.success_url[:8] != "https://":
         raise HTTPException(
             detail="Success URL must be secure https://...",

lnbits/templates/base.html

@@ -38,7 +38,8 @@
               <img height="30px" alt="Logo" src="{{ USE_CUSTOM_LOGO }}" />
               {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else
               %}
-              <strong>LN</strong>bits {% endif %} {%endif%} {% endblock %}
+              <span><strong>LN</strong>bits</span> {% endif %} {%endif%} {%
+              endblock %}
             </q-btn>
           </q-toolbar-title>
           {% block beta %}

lnbits/templates/public.html

@@ -8,6 +8,7 @@
   {% if USE_CUSTOM_LOGO %}
   <img height="30px" alt="Logo" src="{{ USE_CUSTOM_LOGO }}" />
   {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else %}
-  <strong>LN</strong>bits {% endif %} {% endif %}
+  <span><strong>LN</strong>bits</span>
+  {% endif %} {% endif %}
 </a>
 {% endblock %}

requirements.txt

@@ -24,7 +24,7 @@ lnurl==0.3.6
 markupsafe==2.0.1
 marshmallow==3.13.0
 outcome==1.1.0
-psycopg2-binary==2.9.1
+psycopg2==2.9.3
 pycryptodomex==3.14.1
 pydantic==1.8.2
 pypng==0.0.21