Merge branch 'dev'

.env.example

@@ -1,28 +1,5 @@
 #For more information on .env files, their content and format: https://pypi.org/project/python-dotenv/
 
-######################################
-########### Admin Settings ###########
-######################################
-
-# Enable Admin GUI, available for the first user in LNBITS_ADMIN_USERS if available.
-# Warning: Enabling this will make LNbits ignore most configurations in file. Only the
-# configurations defined in `ReadOnlySettings` will still be read from the environment variables.
-# The rest of the settings will be stored in your database and you will be able to change them
-# only  through the Admin UI.
-# Disable this to make LNbits use this config file again.
-LNBITS_ADMIN_UI=false
-
-# Change theme
-LNBITS_SITE_TITLE="LNbits"
-LNBITS_SITE_TAGLINE="free and open-source lightning wallet"
-LNBITS_SITE_DESCRIPTION="Some description about your service, will display if title is not 'LNbits'"
-# Choose from bitcoin, mint, flamingo, freedom, salvador, autumn, monochrome, classic, cyber
-LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador, cyber"
-# LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg"
-
-HOST=127.0.0.1
-PORT=5000
-
 ######################################
 ########## Funding Source ############
 ######################################
@@ -101,34 +78,48 @@ ECLAIR_PASS=eclairpw
 LNTIPS_API_KEY=LNTIPS_ADMIN_KEY
 LNTIPS_API_ENDPOINT=https://ln.tips
 
+######################################
+########### Admin Settings ###########
+######################################
+
+# Enable Admin GUI, available for the first user in LNBITS_ADMIN_USERS if available
+# Warning: Enabling this will make LNbits ignore this configuration file. Your settings will
+# be stored in your database and you will be able to change them only through the Admin UI.
+# Disable this to make LNbits use this config file again.
+LNBITS_ADMIN_UI=false
+
+# Change theme
+LNBITS_SITE_TITLE="LNbits"
+LNBITS_SITE_TAGLINE="free and open-source lightning wallet"
+LNBITS_SITE_DESCRIPTION="Some description about your service, will display if title is not 'LNbits'"
+# Choose from bitcoin, mint, flamingo, freedom, salvador, autumn, monochrome, classic, cyber
+LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador, cyber"
+# LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg"
+
+HOST=127.0.0.1
+PORT=5000
+
 ######################################
 ####### Auth Configurations ##########
 ######################################
 # Secret Key: will default to the hash of the super user. It is strongly recommended that you set your own value.
 AUTH_SECRET_KEY=""
 AUTH_TOKEN_EXPIRE_MINUTES=525600
-# Possible authorization methods: user-id-only, username-password, google-auth, github-auth, keycloak-auth
+# Possible authorization methods: user-id-only, username-password, google-auth, github-auth
 AUTH_ALLOWED_METHODS="user-id-only, username-password"
 # Set this flag if HTTP is used for OAuth
 # OAUTHLIB_INSECURE_TRANSPORT="1"
 
 # Google OAuth Config
-# Make sure that the authorized redirect URIs contain https://{domain}/api/v1/auth/google/token
+# Make sure thant the authorized redirect URIs contain https://{domain}/api/v1/auth/google/token
 GOOGLE_CLIENT_ID=""
 GOOGLE_CLIENT_SECRET=""
 
 # GitHub OAuth Config
-# Make sure that the authorization callback URL is set to https://{domain}/api/v1/auth/github/token
+# Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/github/token
 GITHUB_CLIENT_ID=""
 GITHUB_CLIENT_SECRET=""
 
-# Keycloak OAuth Config
-# Make sure that the valid redirect URIs contain https://{domain}/api/v1/auth/keycloak/token
-KEYCLOAK_CLIENT_ID=""
-KEYCLOAK_CLIENT_SECRET=""
-KEYCLOAK_DISCOVERY_URL=""
-
-
 ######################################
 
 # uvicorn variable, uncomment to allow https behind a proxy
@@ -207,13 +198,6 @@ LNBITS_RESERVE_FEE_MIN=2000
 # value in percent
 LNBITS_RESERVE_FEE_PERCENT=1.0
 
-# limit the maximum balance for each wallet
-# throw an error if the wallet attempts to create a new invoice
-
-# LNBITS_WALLET_LIMIT_MAX_BALANCE=1000000
-# LNBITS_WALLET_LIMIT_DAILY_MAX_WITHDRAW=1000000
-# LNBITS_WALLET_LIMIT_SECS_BETWEEN_TRANS=60
-
 # Limit fiat currencies allowed to see in UI
 # LNBITS_ALLOWED_CURRENCIES="EUR, USD"
 

.github/workflows/docker.yml

@@ -1,11 +1,6 @@
 name: docker
 
 on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        default: latest
-        type: string
   workflow_call:
     inputs:
       tag:
@@ -43,7 +38,7 @@ jobs:
             context: .
             push: true
             tags: ${{ secrets.DOCKER_USERNAME }}/lnbits:${{ inputs.tag }}
-            platforms: linux/amd64,linux/arm64
+            platforms: [ linux/amd64, linux/arm64 ]
             cache-from: type=local,src=/tmp/.buildx-cache
             cache-to: type=local,dest=/tmp/.buildx-cache
 
@@ -53,6 +48,6 @@ jobs:
             context: .
             push: true
             tags: ${{ secrets.DOCKER_USERNAME }}/lnbits:latest
-            platforms: linux/amd64,linux/arm64
+            platforms: [ linux/amd64, linux/arm64 ]
             cache-from: type=local,src=/tmp/.buildx-cache
             cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/regtest.yml

@@ -33,8 +33,8 @@ jobs:
         with:
             context: .
             push: false
-            tags: lnbits/lnbits:latest
-            cache-from: type=registry,ref=lnbits/lnbits:latest
+            tags: lnbitsdocker/lnbits-legend:latest
+            cache-from: type=registry,ref=lnbitsdocker/lnbits-legend:latest
             cache-to: type=inline
 
       - name: Setup Regtest
@@ -51,7 +51,7 @@ jobs:
 
       - name: Create fake admin
         if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
-        run: docker exec lnbits-lnbits-1 poetry run python tools/create_fake_admin.py
+        run: docker exec lnbits-legend-lnbits-1 poetry run python tools/create_fake_admin.py
 
       - name: Run Tests
         env:

.github/workflows/release.yml

@@ -13,7 +13,6 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - name: Create github release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -2,7 +2,7 @@ FROM python:3.10-slim-bullseye
 
 RUN apt-get clean
 RUN apt-get update
-RUN apt-get install -y curl pkg-config build-essential libnss-myhostname
+RUN apt-get install -y curl pkg-config build-essential
 
 RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"

docs/guide/installation.md

@@ -101,19 +101,19 @@ SUPER_USER=be54db7f245346c8833eaa430e1e0405 LNBITS_ADMIN_UI=true ./result/bin/ln
 
 use latest version from docker hub
 ```sh
-docker pull lnbits/lnbits
+docker pull lnbitsdocker/lnbits-legend
 wget https://raw.githubusercontent.com/lnbits/lnbits/main/.env.example -O .env
 mkdir data
-docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
+docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbitsdocker/lnbits-legend
 ```
 build the image yourself
 ```sh
 git clone https://github.com/lnbits/lnbits.git
 cd lnbits
-docker build -t lnbits/lnbits .
+docker build -t lnbitsdocker/lnbits-legend .
 cp .env.example .env
 mkdir data
-docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
+docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbitsdocker/lnbits-legend
 ```
 
 ## Option 4: Fly.io

lnbits/app.py

@@ -23,7 +23,7 @@ from slowapi.util import get_remote_address
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.responses import JSONResponse
 
-from lnbits.core.crud import get_dbversions, get_installed_extensions
+from lnbits.core.crud import get_installed_extensions
 from lnbits.core.helpers import migrate_extension_database
 from lnbits.core.services import websocketUpdater
 from lnbits.core.tasks import (  # register_watchdog,; unregister_watchdog,
@@ -35,7 +35,7 @@ from lnbits.tasks import cancel_all_tasks, create_permanent_task
 from lnbits.utils.cache import cache
 from lnbits.wallets import get_wallet_class, set_wallet_class
 
-from .commands import migrate_databases
+from .commands import db_versions, migrate_databases
 from .core import init_core_routers
 from .core.db import core_app_extra
 from .core.services import check_admin_settings, check_webpush_settings
@@ -273,7 +273,7 @@ async def restore_installed_extension(app: FastAPI, ext: InstallableExtension):
     extension = Extension.from_installable_ext(ext)
     register_ext_routes(app, extension)
 
-    current_version = (await get_dbversions()).get(ext.id, 0)
+    current_version = (await db_versions()).get(ext.id, 0)
     await migrate_extension_database(extension, current_version)
 
     # mount routes for the new version

lnbits/core/crud.py

@@ -1097,8 +1097,6 @@ async def get_admin_settings(is_super_user: bool = False) -> Optional[AdminSetti
         return None
     row_dict = dict(sets)
     row_dict.pop("super_user")
-    row_dict.pop("auth_all_methods")
-
     admin_settings = AdminSettings(
         is_super_user=is_super_user,
         lnbits_allowed_funding_sources=settings.lnbits_allowed_funding_sources,

lnbits/core/helpers.py

@@ -53,45 +53,8 @@ async def stop_extension_background_work(
 ):
     """
     Stop background work for extension (like asyncio.Tasks, WebSockets, etc).
-    Extensions SHOULD expose a `api_stop()` function and/or a DELETE enpoint
-    at the root level of their API.
+    Extensions SHOULD expose a DELETE enpoint at the root level of their API.
     """
-    stopped = await _stop_extension_background_work(ext_id)
-
-    if not stopped:
-        # fallback to REST API call
-        await _stop_extension_background_work_via_api(ext_id, user, access_token)
-
-
-async def _stop_extension_background_work(ext_id) -> bool:
-    upgrade_hash = settings.extension_upgrade_hash(ext_id) or ""
-    ext = Extension(ext_id, True, False, upgrade_hash=upgrade_hash)
-
-    try:
-        logger.info(f"Stopping background work for extension '{ext.module_name}'.")
-        old_module = importlib.import_module(ext.module_name)
-
-        # Extensions must expose an `{ext_id}_stop()` function at the module level
-        # The `api_stop()` function is for backwards compatibility (will be deprecated)
-        stop_fns = [f"{ext_id}_stop", "api_stop"]
-        stop_fn_name = next((fn for fn in stop_fns if hasattr(old_module, fn)), None)
-        assert stop_fn_name, "No stop function found for '{ext.module_name}'"
-
-        await getattr(old_module, stop_fn_name)()
-
-        logger.info(f"Stopped background work for extension '{ext.module_name}'.")
-    except Exception as ex:
-        logger.warning(f"Failed to stop background work for '{ext.module_name}'.")
-        logger.warning(ex)
-        return False
-
-    return True
-
-
-async def _stop_extension_background_work_via_api(ext_id, user, access_token):
-    logger.info(
-        f"Stopping background work for extension '{ext_id}' using the REST API."
-    )
     async with httpx.AsyncClient() as client:
         try:
             url = f"http://{settings.host}:{settings.port}/{ext_id}/api/v1?usr={user}"
@@ -100,11 +63,7 @@ async def _stop_extension_background_work_via_api(ext_id, user, access_token):
             )
             resp = await client.delete(url=url, headers=headers)
             resp.raise_for_status()
-            logger.info(f"Stopped background work for extension '{ext_id}'.")
         except Exception as ex:
-            logger.warning(
-                f"Failed to stop background work for '{ext_id}' using the REST API."
-            )
             logger.warning(ex)
 
 

lnbits/core/services.py

@@ -1,7 +1,6 @@
 import asyncio
 import datetime
 import json
-import time
 from io import BytesIO
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple, TypedDict
@@ -42,7 +41,6 @@ from .crud import (
     create_wallet,
     delete_wallet_payment,
     get_account,
-    get_payments,
     get_standalone_payment,
     get_super_settings,
     get_total_balance,
@@ -120,9 +118,8 @@ async def create_invoice(
     if not amount > 0:
         raise InvoiceFailure("Amountless invoices not supported.")
 
-    user_wallet = await get_wallet(wallet_id, conn=conn)
-    if not user_wallet:
-        raise InvoiceFailure(f"Could not fetch wallet '{wallet_id}'.")
+    if await get_wallet(wallet_id, conn=conn) is None:
+        raise InvoiceFailure("Wallet does not exist.")
 
     invoice_memo = None if description_hash else memo
 
@@ -133,14 +130,6 @@ async def create_invoice(
         amount, wallet_id, currency=currency, extra=extra, conn=conn
     )
 
-    if settings.is_wallet_max_balance_exceeded(
-        user_wallet.balance_msat / 1000 + amount_sat
-    ):
-        raise InvoiceFailure(
-            f"Wallet balance  cannot exceed "
-            f"{settings.lnbits_wallet_limit_max_balance} sats."
-        )
-
     ok, checking_id, payment_request, error_message = await wallet.create_invoice(
         amount=amount_sat,
         memo=invoice_memo,
@@ -196,8 +185,6 @@ async def pay_invoice(
     if max_sat and invoice.amount_msat > max_sat * 1000:
         raise ValueError("Amount in invoice is too high.")
 
-    await check_wallet_limits(wallet_id, conn, invoice.amount_msat)
-
     async with db.reuse_conn(conn) if conn else db.connect() as conn:
         temp_id = invoice.payment_hash
         internal_id = f"internal_{invoice.payment_hash}"
@@ -385,58 +372,6 @@ async def pay_invoice(
     return invoice.payment_hash
 
 
-async def check_wallet_limits(wallet_id, conn, amount_msat):
-    await check_time_limit_between_transactions(conn, wallet_id)
-    await check_wallet_daily_withdraw_limit(conn, wallet_id, amount_msat)
-
-
-async def check_time_limit_between_transactions(conn, wallet_id):
-    limit = settings.lnbits_wallet_limit_secs_between_trans
-    if not limit or limit <= 0:
-        return
-
-    payments = await get_payments(
-        since=int(time.time()) - limit,
-        wallet_id=wallet_id,
-        limit=1,
-        conn=conn,
-    )
-
-    if len(payments) == 0:
-        return
-
-    raise ValueError(
-        f"The time limit of {limit} seconds between payments has been reached."
-    )
-
-
-async def check_wallet_daily_withdraw_limit(conn, wallet_id, amount_msat):
-    limit = settings.lnbits_wallet_limit_daily_max_withdraw
-    if not limit or limit <= 0:
-        return
-
-    payments = await get_payments(
-        since=int(time.time()) - 60 * 60 * 24,
-        outgoing=True,
-        wallet_id=wallet_id,
-        limit=1,
-        conn=conn,
-    )
-    if len(payments) == 0:
-        return
-
-    total = 0
-    for pay in payments:
-        total += pay.amount
-    total = total - amount_msat
-    if limit * 1000 + total < 0:
-        raise ValueError(
-            "Daily withdrawal limit of "
-            + str(settings.lnbits_wallet_limit_daily_max_withdraw)
-            + " sats reached."
-        )
-
-
 async def redeem_lnurl_withdraw(
     wallet_id: str,
     lnurl_request: str,

lnbits/core/sso/keycloak.py

@@ -1,37 +0,0 @@
-"""Keycloak SSO Login Helper
-"""
-
-from typing import Optional
-
-import httpx
-from fastapi_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
-
-
-class KeycloakSSO(SSOBase):
-    """Class providing login via Keycloak OAuth"""
-
-    provider = "keycloak"
-    scope = ["openid", "email", "profile"]
-    discovery_url = ""
-
-    async def openid_from_response(
-        self, response: dict, session: Optional["httpx.AsyncClient"] = None
-    ) -> OpenID:
-        """Return OpenID from user information provided by Keycloak"""
-        return OpenID(
-            email=response.get("email", ""),
-            provider=self.provider,
-            id=response.get("sub"),
-            first_name=response.get("given_name"),
-            last_name=response.get("family_name"),
-            display_name=response.get("name"),
-            picture=response.get("picture"),
-        )
-
-    async def get_discovery_document(self) -> DiscoveryDocument:
-        """Get document containing handy urls"""
-        async with httpx.AsyncClient() as session:
-            response = await session.get(self.discovery_url)
-            content = response.json()
-
-            return content

lnbits/core/tasks.py

@@ -18,13 +18,16 @@ from lnbits.core.services import (
 )
 from lnbits.settings import get_wallet_class, settings
 from lnbits.tasks import (
+    SseListenersDict,
     create_permanent_task,
     create_task,
     register_invoice_listener,
     send_push_notification,
 )
 
-api_invoice_listeners: Dict[str, asyncio.Queue] = {}
+api_invoice_listeners: Dict[str, asyncio.Queue] = SseListenersDict(
+    "api_invoice_listeners"
+)
 
 
 def register_killswitch():

lnbits/core/templates/admin/_tab_security.html

@@ -78,41 +78,6 @@
       </div>
     </div>
   </q-card-section>
-  <q-card-section
-    v-if="formData.auth_allowed_methods?.includes('keycloak-auth')"
-    class="q-pl-xl"
-  >
-    <strong class="q-my-none q-mb-sm">Keycloak Auth</strong>
-
-    <div class="row">
-      <div class="col-md-4 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.keycloak_discovery_url"
-          label="Keycloak Discovey URL"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-4 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.keycloak_client_id"
-          label="Keycloak Client ID"
-          hint="Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/keycloak/token"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-4 col-sm-12">
-        <q-input
-          filled
-          v-model="formData.keycloak_client_secret"
-          type="password"
-          label="Keycloak Client Secret"
-        >
-        </q-input>
-      </div>
-    </div>
-  </q-card-section>
   <q-separator></q-separator>
   <q-card-section class="q-pa-none">
     <br />
@@ -215,7 +180,6 @@
             </div>
           </div>
         </div>
-
         <div class="col-12 col-md-12">
           <p v-text="$t('rate_limiter')"></p>
           <div class="row q-col-gutter-md">
@@ -237,36 +201,6 @@
             </div>
           </div>
         </div>
-
-        <div class="col-12 col-md-12">
-          <p v-text="$t('wallet_limiter')"></p>
-          <div class="row q-col-gutter-md">
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_max_balance"
-                :label="$t('wallet_max_ballance')"
-              ></q-input>
-            </div>
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_daily_max_withdraw"
-                :label="$t('wallet_limit_max_withdraw_per_day')"
-              ></q-input>
-            </div>
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_secs_between_trans"
-                :label="$t('wallet_limit_secs_between_trans')"
-              ></q-input>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
     <br />

lnbits/core/templates/admin/_tab_users.html

@@ -16,6 +16,7 @@
           <q-btn @click="addAdminUser" dense flat icon="add"></q-btn>
         </q-input>
         <div>
+          {%raw%}
           <q-chip
             v-for="user in formData.lnbits_admin_users"
             :key="user"
@@ -23,9 +24,10 @@
             @remove="removeAdminUser(user)"
             color="primary"
             text-color="white"
-            v-text="user"
           >
+            {{ user }}
           </q-chip>
+          {%endraw%}
         </div>
         <br />
       </div>
@@ -42,6 +44,7 @@
           <q-btn @click="addAllowedUser" dense flat icon="add"></q-btn>
         </q-input>
         <div>
+          {% raw %}
           <q-chip
             v-for="user in formData.lnbits_allowed_users"
             :key="user"
@@ -49,29 +52,12 @@
             @remove="removeAllowedUser(user)"
             color="primary"
             text-color="white"
-            v-text="user"
           >
+            {{ user }}
           </q-chip>
+          {% endraw %}
         </div>
         <br />
-        <q-item tag="label" v-ripple>
-          <q-item-section>
-            <q-item-label>Allow creation of new users</q-item-label>
-            <q-item-label caption
-              >Allow creation of new users on the index page</q-item-label
-            >
-          </q-item-section>
-          <q-item-section avatar>
-            <q-toggle
-              size="md"
-              v-model="formData.lnbits_allow_new_accounts"
-              checked-icon="check"
-              color="green"
-              unchecked-icon="clear"
-            />
-          </q-item-section>
-        </q-item>
-        <br />
       </div>
     </div>
   </q-card-section>

lnbits/core/templates/core/_api_docs.html

@@ -5,7 +5,6 @@
   :content-inset-level="0.5"
 >
   <q-card-section>
-    <strong>Node URL: </strong><em v-text="origin"></em><br />
     <strong>Wallet ID: </strong><em>{{ wallet.id }}</em><br />
     <strong>Admin key: </strong><em>{{ wallet.adminkey }}</em><br />
     <strong>Invoice/read key: </strong><em>{{ wallet.inkey }}</em>

lnbits/core/templates/core/account.html

@@ -401,23 +401,6 @@
                     ></lnbits-notifications-btn>
                   </div>
                 </div>
-                <div class="row q-mb-md">
-                  <div class="col-4">
-                    <span v-text="$t('payment_reactions')"></span>
-                  </div>
-                  <div class="col-8">
-                    <q-select
-                      v-model="reactionChoice"
-                      :options="reactionOptions"
-                      label="Reactions"
-                      @input="reactionChoiceFunc"
-                    >
-                      <q-tooltip
-                        ><span v-text="$t('payment_reactions')"></span
-                      ></q-tooltip>
-                    </q-select>
-                  </div>
-                </div>
               </q-tab-panel>
             </q-tab-panels>
           </div>

lnbits/core/templates/core/index.html

@@ -4,16 +4,12 @@
 <div class="row q-col-gutter-md justify-center">
   <div
     v-if="isUserAuthorized"
-    class="col-12 col-md-6 col-lg-6 q-gutter-y-md"
+    class="col-12 col-md-7 col-lg-6 q-gutter-y-md"
   ></div>
-  <div v-else class="col-12 col-md-4 col-lg-4 q-gutter-y-md">
+  <div v-else class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
     <div class="gt-sm">
-      <h3 class="q-my-none" v-if="'{{SITE_TITLE}}' == 'LNbits'">
-        {{SITE_TITLE}}
-      </h3>
-      <h5 class="q-my-md" v-if="'{{SITE_TITLE}}' == 'LNbits'">
-        {{SITE_TAGLINE}}
-      </h5>
+      <h3 class="q-my-none">{{SITE_TITLE}}</h3>
+      <h5 class="q-my-md">{{SITE_TAGLINE}}</h5>
     </div>
     {% if lnurl and LNBITS_NEW_ACCOUNTS_ALLOWED and ("user-id-only" in
     LNBITS_AUTH_METHODS)%}
@@ -37,7 +33,7 @@
     {%else%} {% endif %}
 
     <div class="row q-mt-md">
-      <div class="col-12 col-md-10 col-lg-10 q-gutter-y-md">
+      <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
         <q-badge v-if="isAccessTokenExpired" color="primary" rounded>
           <div class="text-h5">
             <span v-text="$t('session_has_expired')"></span>
@@ -263,25 +259,6 @@
                   <div><span v-text="$t('signin_with_github')"></span></div>
                 </q-btn>
               </div>
-              {%endif%} {% if "keycloak-auth" in LNBITS_AUTH_METHODS %}
-              <div class="col-12 full-width q-pa-sm">
-                <q-btn
-                  href="/api/v1/auth/keycloak"
-                  type="a"
-                  outline
-                  no-caps
-                  color="grey"
-                  rounded
-                  class="full-width"
-                >
-                  <q-avatar size="32px" class="q-mr-md">
-                    <q-img
-                      :src="'{{ static_url_for('static', 'images/keycloak-logo.png') }}'"
-                    ></q-img>
-                  </q-avatar>
-                  <div><span v-text="$t('signin_with_keycloak')"></span></div>
-                </q-btn>
-              </div>
               {%endif%}
             </div>
           </q-card-section>
@@ -305,16 +282,11 @@
     </div>
   </div>
 
+  <!-- Ads -->
   <div
-    v-if="'{{SITE_TITLE}}' != 'LNbits'"
-    class="col-12 col-md-5 col-lg-5 q-pt-xl"
+    class="col-12 col-md-3 col-lg-3 gt-sm"
+    v-if="'{{SITE_TITLE}}' == 'LNbits'"
   >
-    <h3 class="q-my-none">{{SITE_TITLE}}</h3>
-    <h5 class="q-my-md">{{SITE_TAGLINE}}</h5>
-    <div v-html="formatDescription"></div>
-  </div>
-
-  <div class="col-12 col-md-3 col-lg-3 gt-sm" v-else>
     <div class="row q-col-gutter-lg justify-center">
       <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
         <q-btn
@@ -493,22 +465,27 @@
           <div class="col q-pl-md"></div>
         </div>
       </div>
+
+      {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
+      <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
+        <q-btn flat color="secondary" class="full-width q-mb-md"
+          >{{ AD_SPACE_TITLE }}</q-btn
+        >
+
+        <a href="{{ AD[0] }}" class="q-ma-md">
+          <img
+            v-if="($q.dark.isActive)"
+            src="{{ AD[1] }}"
+            style="max-width: 90%"
+          />
+          <img v-else src="{{ AD[2] }}" style="max-width: 90%" />
+        </a>
+      </div>
+      {% endfor %} {% endif %}
     </div>
   </div>
-  {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
-  <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
-    <q-btn flat color="secondary" class="full-width q-mb-md"
-      >{{ AD_SPACE_TITLE }}</q-btn
-    >
-
-    <a href="{{ AD[0] }}" class="q-ma-md">
-      <img v-if="($q.dark.isActive)" src="{{ AD[1] }}" style="max-width: 90%" />
-      <img v-else src="{{ AD[2] }}" style="max-width: 90%" />
-    </a>
-  </div>
-  {% endfor %} {% endif %}
 </div>
-<div v-if="'{{SITE_TITLE}}' == 'LNbits'" class="row gt-sm q-mt-xl">
+<div class="row gt-sm q-mt-xl">
   <div class="col-1"></div>
   <div class="col-10 q-pl-xl">
     <span v-text="$t('lnbits_description')"></span>

lnbits/core/templates/core/wallet.html

@@ -922,11 +922,8 @@
 
       <q-dialog v-model="disclaimerDialog.show" position="top">
         <q-card class="q-pa-lg">
-          <h6
-            class="q-my-md text-primary"
-            v-text="$t('disclaimer_dialog_title')"
-          ></h6>
-          <p class="whitespace-pre-line" v-text="$t('disclaimer_dialog')"></p>
+          <h6 class="q-my-md text-primary">Warning</h6>
+          <p v-text="$t('disclaimer_dialog')"></p>
           <div class="row q-mt-lg">
             <q-btn
               outline

lnbits/core/views/admin_api.py

@@ -17,11 +17,9 @@ from lnbits.core.services import (
     update_cached_settings,
     update_wallet_balance,
 )
-from lnbits.core.tasks import api_invoice_listeners
 from lnbits.decorators import check_admin, check_super_user
 from lnbits.server import server_restart
 from lnbits.settings import AdminSettings, UpdateSettings, settings
-from lnbits.tasks import invoice_listeners
 
 from .. import core_app_extra
 from ..crud import delete_admin_settings, get_admin_settings, update_admin_settings
@@ -50,19 +48,6 @@ async def api_auditor():
         )
 
 
-@admin_router.get(
-    "/admin/api/v1/monitor",
-    name="Monitor",
-    description="show the current listeners and other monitoring data",
-    dependencies=[Depends(check_admin)],
-)
-async def api_monitor():
-    return {
-        "invoice_listeners": list(invoice_listeners.keys()),
-        "api_invoice_listeners": list(api_invoice_listeners.keys()),
-    }
-
-
 @admin_router.get("/admin/api/v1/settings/", response_model=Optional[AdminSettings])
 async def api_get_settings(
     user: User = Depends(check_admin),

lnbits/core/views/api.py

@@ -824,9 +824,8 @@ async def api_install_extension(
 
         await add_installed_extension(ext_info)
 
-        if extension.is_upgrade_extension:
-            # call stop while the old routes are still active
-            await stop_extension_background_work(data.ext_id, user.id, access_token)
+        # call stop while the old routes are still active
+        await stop_extension_background_work(data.ext_id, user.id, access_token)
 
         if data.ext_id not in settings.lnbits_deactivated_extensions:
             settings.lnbits_deactivated_extensions += [data.ext_id]

lnbits/core/views/auth_api.py

@@ -1,9 +1,10 @@
-import importlib
-from typing import Callable, Optional
+from typing import Optional
 
 from fastapi import APIRouter, Depends, HTTPException, Request, status
 from fastapi.responses import JSONResponse, RedirectResponse
-from fastapi_sso.sso.base import OpenID, SSOBase
+from fastapi_sso.sso.base import OpenID
+from fastapi_sso.sso.github import GithubSSO
+from fastapi_sso.sso.google import GoogleSSO
 from loguru import logger
 from starlette.status import (
     HTTP_400_BAD_REQUEST,
@@ -93,35 +94,43 @@ async def login_usr(data: LoginUsr) -> JSONResponse:
         raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot login.")
 
 
-@auth_router.get("/api/v1/auth/{provider}", description="SSO Provider")
-async def login_with_sso_provider(
-    request: Request, provider: str, user_id: Optional[str] = None
-):
-    provider_sso = _new_sso(provider)
-    if not provider_sso:
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, f"Login by '{provider}' not allowed."
-        )
+@auth_router.get("/api/v1/auth/google", description="Google SSO")
+async def login_with_google(request: Request, user_id: Optional[str] = None):
+    google_sso = _new_google_sso()
+    if not google_sso:
+        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'Google' not allowed.")
 
-    provider_sso.redirect_uri = str(request.base_url) + f"api/v1/auth/{provider}/token"
-    with provider_sso:
+    google_sso.redirect_uri = str(request.base_url) + "api/v1/auth/google/token"
+    with google_sso:
         state = encrypt_internal_message(user_id)
-        return await provider_sso.get_login_redirect(state=state)
+        return await google_sso.get_login_redirect(state=state)
 
 
-@auth_router.get("/api/v1/auth/{provider}/token", description="Handle OAuth callback")
-async def handle_oauth_token(request: Request, provider: str) -> RedirectResponse:
-    provider_sso = _new_sso(provider)
-    if not provider_sso:
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, f"Login by '{provider}' not allowed."
-        )
+@auth_router.get("/api/v1/auth/github", description="Github SSO")
+async def login_with_github(request: Request, user_id: Optional[str] = None):
+    github_sso = _new_github_sso()
+    if not github_sso:
+        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'GitHub' not allowed.")
+
+    github_sso.redirect_uri = str(request.base_url) + "api/v1/auth/github/token"
+    with github_sso:
+        state = decrypt_internal_message(user_id)
+        return await github_sso.get_login_redirect(state=state)
+
+
+@auth_router.get(
+    "/api/v1/auth/google/token", description="Handle Google OAuth callback"
+)
+async def handle_google_token(request: Request) -> RedirectResponse:
+    google_sso = _new_google_sso()
+    if not google_sso:
+        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'Google' not allowed.")
 
     try:
-        with provider_sso:
-            userinfo = await provider_sso.verify_and_process(request)
+        with google_sso:
+            userinfo = await google_sso.verify_and_process(request)
             assert userinfo is not None
-            user_id = decrypt_internal_message(provider_sso.state)
+            user_id = decrypt_internal_message(google_sso.state)
         request.session.pop("user", None)
         return await _handle_sso_login(userinfo, user_id)
     except HTTPException as e:
@@ -131,8 +140,34 @@ async def handle_oauth_token(request: Request, provider: str) -> RedirectRespons
     except Exception as e:
         logger.debug(e)
         raise HTTPException(
-            HTTP_500_INTERNAL_SERVER_ERROR,
-            f"Cannot authenticate user with {provider} Auth.",
+            HTTP_500_INTERNAL_SERVER_ERROR, "Cannot authenticate user with Google Auth."
+        )
+
+
+@auth_router.get(
+    "/api/v1/auth/github/token", description="Handle Github OAuth callback"
+)
+async def handle_github_token(request: Request) -> RedirectResponse:
+    github_sso = _new_github_sso()
+    if not github_sso:
+        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'GitHub' not allowed.")
+
+    try:
+        with github_sso:
+            userinfo = await github_sso.verify_and_process(request)
+            assert userinfo is not None
+            user_id = decrypt_internal_message(github_sso.state)
+        request.session.pop("user", None)
+        return await _handle_sso_login(userinfo, user_id)
+
+    except HTTPException as e:
+        raise e
+    except ValueError as e:
+        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
+    except Exception as e:
+        logger.debug(e)
+        raise HTTPException(
+            HTTP_500_INTERNAL_SERVER_ERROR, "Cannot authenticate user with GitHub Auth."
         )
 
 
@@ -305,44 +340,29 @@ def _auth_redirect_response(path: str, email: str) -> RedirectResponse:
     return response
 
 
-def _new_sso(provider: str) -> Optional[SSOBase]:
-    try:
-        if not settings.is_auth_method_allowed(AuthMethods(f"{provider}-auth")):
-            return None
-
-        client_id = getattr(settings, f"{provider}_client_id", None)
-        client_secret = getattr(settings, f"{provider}_client_secret", None)
-        discovery_url = getattr(settings, f"{provider}_discovery_url", None)
-
-        if not client_id or not client_secret:
-            logger.warning(f"{provider} auth allowed but not configured.")
-            return None
-
-        SSOProviderClass = _find_auth_provider_class(provider)
-        ssoProvider = SSOProviderClass(
-            client_id, client_secret, None, allow_insecure_http=True
-        )
-        if (
-            discovery_url
-            and getattr(ssoProvider, "discovery_url", discovery_url) != discovery_url
-        ):
-            ssoProvider.discovery_url = discovery_url
-        return ssoProvider
-    except Exception as e:
-        logger.warning(e)
-
-    return None
+def _new_google_sso() -> Optional[GoogleSSO]:
+    if not settings.is_auth_method_allowed(AuthMethods.google_auth):
+        return None
+    if not settings.is_google_auth_configured:
+        logger.warning("Google Auth allowed but not configured.")
+        return None
+    return GoogleSSO(
+        settings.google_client_id,
+        settings.google_client_secret,
+        None,
+        allow_insecure_http=True,
+    )
 
 
-def _find_auth_provider_class(provider: str) -> Callable:
-    sso_modules = ["lnbits.core.sso", "fastapi_sso.sso"]
-    for module in sso_modules:
-        try:
-            provider_module = importlib.import_module(f"{module}.{provider}")
-            ProviderClass = getattr(provider_module, f"{provider.title()}SSO")
-            if ProviderClass:
-                return ProviderClass
-        except Exception:
-            pass
-
-    raise ValueError(f"No SSO provider found for '{provider}'.")
+def _new_github_sso() -> Optional[GithubSSO]:
+    if not settings.is_auth_method_allowed(AuthMethods.github_auth):
+        return None
+    if not settings.is_github_auth_configured:
+        logger.warning("Github Auth allowed but not configured.")
+        return None
+    return GithubSSO(
+        settings.github_client_id,
+        settings.github_client_secret,
+        None,
+        allow_insecure_http=True,
+    )

lnbits/core/views/generic.py

@@ -95,10 +95,11 @@ async def extensions_install(
         installed_exts: List["InstallableExtension"] = await get_installed_extensions()
         installed_exts_ids = [e.id for e in installed_exts]
 
-        installable_exts = await InstallableExtension.get_installable_extensions()
-        installable_exts_ids = [e.id for e in installable_exts]
+        installable_exts: List[
+            InstallableExtension
+        ] = await InstallableExtension.get_installable_extensions()
         installable_exts += [
-            e for e in installed_exts if e.id not in installable_exts_ids
+            e for e in installed_exts if e.id not in installed_exts_ids
         ]
 
         for e in installable_exts:

lnbits/helpers.py

@@ -92,10 +92,6 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
 
 def get_current_extension_name() -> str:
     """
-    DEPRECATED: Use the repo name instead, will be removed in the future
-    before: `register_invoice_listener(invoice_queue, get_current_extension_name())`
-    after: `register_invoice_listener(invoice_queue, "my-extension")`
-
     Returns the name of the extension that calls this method.
     """
     import inspect

lnbits/nodes/lndrest.py

@@ -369,7 +369,7 @@ class LndRestNode(Node):
                 memo=invoice["memo"],
                 pending=invoice["state"] == "OPEN",
                 paid_at=invoice["settle_date"],
-                expiry=int(invoice["creation_date"]) + int(invoice["expiry"]),
+                expiry=invoice["creation_date"] + invoice["expiry"],
                 preimage=_decode_bytes(invoice["r_preimage"]),
                 bolt11=invoice["payment_request"],
             )

lnbits/settings.py

@@ -68,16 +68,6 @@ class InstalledExtensionsSettings(LNbitsSettings):
     # list of redirects that extensions want to perform
     lnbits_extensions_redirects: List[Any] = Field(default=[])
 
-    def extension_upgrade_path(self, ext_id: str) -> Optional[str]:
-        return next(
-            (e for e in self.lnbits_upgraded_extensions if e.endswith(f"/{ext_id}")),
-            None,
-        )
-
-    def extension_upgrade_hash(self, ext_id: str) -> Optional[str]:
-        path = settings.extension_upgrade_path(ext_id)
-        return path.split("/")[0] if path else None
-
 
 class ThemesSettings(LNbitsSettings):
     lnbits_site_title: str = Field(default="LNbits")
@@ -126,9 +116,6 @@ class SecuritySettings(LNbitsSettings):
     lnbits_notifications: bool = Field(default=False)
     lnbits_killswitch: bool = Field(default=False)
     lnbits_killswitch_interval: int = Field(default=60)
-    lnbits_wallet_limit_max_balance: int = Field(default=0)
-    lnbits_wallet_limit_daily_max_withdraw: int = Field(default=0)
-    lnbits_wallet_limit_secs_between_trans: int = Field(default=0)
     lnbits_watchdog: bool = Field(default=False)
     lnbits_watchdog_interval: int = Field(default=60)
     lnbits_watchdog_delta: int = Field(default=1_000_000)
@@ -138,13 +125,6 @@ class SecuritySettings(LNbitsSettings):
         )
     )
 
-    def is_wallet_max_balance_exceeded(self, amount):
-        return (
-            self.lnbits_wallet_limit_max_balance
-            and self.lnbits_wallet_limit_max_balance > 0
-            and amount > self.lnbits_wallet_limit_max_balance
-        )
-
 
 class FakeWalletFundingSource(LNbitsSettings):
     fake_wallet_secret: str = Field(default="ToTheMoon1")
@@ -272,7 +252,6 @@ class AuthMethods(Enum):
     username_and_password = "username-password"
     google_auth = "google-auth"
     github_auth = "github-auth"
-    keycloak_auth = "keycloak-auth"
 
 
 class AuthSettings(LNbitsSettings):
@@ -293,16 +272,18 @@ class GoogleAuthSettings(LNbitsSettings):
     google_client_id: str = Field(default="")
     google_client_secret: str = Field(default="")
 
+    @property
+    def is_google_auth_configured(self):
+        return self.google_client_id != "" and self.google_client_secret != ""
+
 
 class GitHubAuthSettings(LNbitsSettings):
     github_client_id: str = Field(default="")
     github_client_secret: str = Field(default="")
 
-
-class KeycloakAuthSettings(LNbitsSettings):
-    keycloak_discovery_url: str = Field(default="")
-    keycloak_client_id: str = Field(default="")
-    keycloak_client_secret: str = Field(default="")
+    @property
+    def is_github_auth_configured(self):
+        return self.github_client_id != "" and self.github_client_secret != ""
 
 
 class EditableSettings(
@@ -318,7 +299,6 @@ class EditableSettings(
     AuthSettings,
     GoogleAuthSettings,
     GitHubAuthSettings,
-    KeycloakAuthSettings,
 ):
     @validator(
         "lnbits_admin_users",

lnbits/static/css/base.css

@@ -550,7 +550,3 @@ video {
   padding: 0.2rem;
   border-radius: 0.2rem;
 }
-
-.whitespace-pre-line {
-  white-space: pre-line;
-}

lnbits/static/i18n/br.js

@@ -61,10 +61,9 @@ window.localisation.br = {
   service_fee_tooltip:
     'Taxa de serviço cobrada pelo administrador do servidor LNbits por transação de saída',
   toggle_darkmode: 'Alternar modo escuro',
-  payment_reactions: 'Reações de Pagamento',
   view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
   api_docs: 'Documentação da API',
-  api_keys_api_docs: 'URL do Node, chaves da API e documentação da API',
+  api_keys_api_docs: 'Chaves de API e documentação da API',
   lnbits_version: 'Versão do LNbits',
   runs_on: 'Executa em',
   credit_hint: 'Pressione Enter para creditar a conta',
@@ -191,12 +190,6 @@ window.localisation.br = {
   allow_access_hint: 'Permitir acesso por IP (substituirá os IPs bloqueados)',
   enter_ip: 'Digite o IP e pressione enter',
   rate_limiter: 'Limitador de Taxa',
-  wallet_limiter: 'Limitador de Carteira',
-  wallet_limit_max_withdraw_per_day:
-    'Retirada máxima diária da carteira em sats (0 para desativar)',
-  wallet_max_ballance: 'Saldo máximo da carteira em sats (0 para desativar)',
-  wallet_limit_secs_between_trans:
-    'Minutos e segundos entre transações por carteira (0 para desativar)',
   number_of_requests: 'Número de solicitações',
   time_unit: 'Unidade de tempo',
   minute: 'minuto',
@@ -215,7 +208,6 @@ window.localisation.br = {
   account_settings: 'Configurações da Conta',
   signin_with_google: 'Entrar com o Google',
   signin_with_github: 'Entrar com GitHub',
-  signin_with_keycloak: 'Entrar com Keycloak',
   username_or_email: 'Nome de usuário ou E-mail',
   password: 'Senha',
   password_config: 'Configuração de Senha',
@@ -238,8 +230,5 @@ window.localisation.br = {
   auth_provider: 'Provedor de Autenticação',
   my_account: 'Minha Conta',
   back: 'Voltar',
-  logout: 'Sair',
-  look_and_feel: 'Aparência',
-  language: 'Idioma',
-  color_scheme: 'Esquema de Cores'
+  logout: 'Sair'
 }

lnbits/static/i18n/cn.js

@@ -57,10 +57,9 @@ window.localisation.cn = {
   service_fee_max: '服务费：%{amount}% 每笔交易（最高 %{max} sats）',
   service_fee_tooltip: 'LNbits服务器管理员每笔外发交易收取的服务费',
   toggle_darkmode: '切换暗黑模式',
-  payment_reactions: '支付反应',
   view_swagger_docs: '查看 LNbits Swagger API 文档',
   api_docs: 'API文档',
-  api_keys_api_docs: '节点URL、API密钥和API文档',
+  api_keys_api_docs: 'API密钥和API文档',
   lnbits_version: 'LNbits版本',
   runs_on: '可运行在',
   credit_hint: '按 Enter 键充值账户',
@@ -180,11 +179,6 @@ window.localisation.cn = {
   allow_access_hint: '允许通过IP访问（将覆盖被屏蔽的IP）',
   enter_ip: '输入IP地址并按回车键',
   rate_limiter: '速率限制器',
-  wallet_limiter: '钱包限制器',
-  wallet_limit_max_withdraw_per_day:
-    '每日钱包最大提现额度（单位：sats）（设为0则禁用）',
-  wallet_max_ballance: '钱包最大余额（以sats计）（设为0则禁用）',
-  wallet_limit_secs_between_trans: '每个钱包交易间最少秒数（设为0则禁用）',
   number_of_requests: '请求次数',
   time_unit: '时间单位',
   minute: '分钟',
@@ -202,8 +196,7 @@ window.localisation.cn = {
   create_account: '创建账户',
   account_settings: '账户设置',
   signin_with_google: '使用谷歌账号登录',
-  signin_with_github: '使用GitHub登录',
-  signin_with_keycloak: '使用Keycloak登录',
+  signin_with_github: '使用 GitHub 登录',
   username_or_email: '用户名或电子邮箱',
   password: '密码',
   password_config: '密码配置',
@@ -226,8 +219,5 @@ window.localisation.cn = {
   auth_provider: '认证提供者',
   my_account: '我的账户',
   back: '返回',
-  logout: '注销',
-  look_and_feel: '外观和感觉',
-  language: '语言',
-  color_scheme: '配色方案'
+  logout: '注销'
 }

lnbits/static/i18n/cs.js

@@ -61,10 +61,9 @@ window.localisation.cs = {
   service_fee_tooltip:
     'Servisní poplatek účtovaný správcem LNbits serveru za odchozí transakci',
   toggle_darkmode: 'Přepnout tmavý režim',
-  payment_reactions: 'Reakce na platby',
   view_swagger_docs: 'Zobrazit LNbits Swagger API dokumentaci',
   api_docs: 'API dokumentace',
-  api_keys_api_docs: 'Adresa uzlu, API klíče a API dokumentace',
+  api_keys_api_docs: 'API klíče a API dokumentace',
   lnbits_version: 'Verze LNbits',
   runs_on: 'Běží na',
   credit_hint: 'Stiskněte Enter pro připsání na účet',
@@ -188,12 +187,6 @@ window.localisation.cs = {
   allow_access_hint: 'Povolit přístup podle IP (přepíše blokované IP)',
   enter_ip: 'Zadejte IP a stiskněte enter',
   rate_limiter: 'Omezovač počtu požadavků',
-  wallet_limiter: 'Omezení peněženky',
-  wallet_limit_max_withdraw_per_day:
-    'Maximální denní limit pro výběr z peněženky v sats (0 pro deaktivaci)',
-  wallet_max_ballance: 'Maximální zůstatek v peněžence v sats (0 pro zakázání)',
-  wallet_limit_secs_between_trans:
-    'Minimální počet sekund mezi transakcemi na peněženku (0 pro vypnutí)',
   number_of_requests: 'Počet požadavků',
   time_unit: 'Časová jednotka',
   minute: 'minuta',
@@ -212,7 +205,6 @@ window.localisation.cs = {
   account_settings: 'Nastavení účtu',
   signin_with_google: 'Přihlásit se přes Google',
   signin_with_github: 'Přihlásit se přes GitHub',
-  signin_with_keycloak: 'Přihlásit se přes Keycloak',
   username_or_email: 'Uživatelské jméno nebo Email',
   password: 'Heslo',
   password_config: 'Konfigurace hesla',
@@ -235,8 +227,5 @@ window.localisation.cs = {
   auth_provider: 'Poskytovatel ověření',
   my_account: 'Můj účet',
   back: 'Zpět',
-  logout: 'Odhlásit se',
-  look_and_feel: 'Vzhled a chování',
-  language: 'Jazyk',
-  color_scheme: 'Barevné schéma'
+  logout: 'Odhlásit se'
 }

lnbits/static/i18n/de.js

@@ -63,10 +63,9 @@ window.localisation.de = {
   service_fee_tooltip:
     'Bearbeitungsgebühr, die vom LNbits Server-Administrator pro ausgehender Transaktion berechnet wird',
   toggle_darkmode: 'Auf Dark Mode umschalten',
-  payment_reactions: 'Zahlungsreaktionen',
   view_swagger_docs: 'LNbits Swagger API-Dokumentation',
   api_docs: 'API-Dokumentation',
-  api_keys_api_docs: 'Knoten-URL, API-Schlüssel und API-Dokumentation',
+  api_keys_api_docs: 'API-Schlüssel und API-Dokumentation',
   lnbits_version: 'LNbits-Version',
   runs_on: 'Läuft auf',
   credit_hint: 'Klicke Enter, um das Konto zu belasten',
@@ -193,13 +192,6 @@ window.localisation.de = {
   allow_access_hint: 'Zugriff durch IP erlauben (überschreibt blockierte IPs)',
   enter_ip: 'Geben Sie die IP ein und drücken Sie die Eingabetaste',
   rate_limiter: 'Ratenbegrenzer',
-  wallet_limiter: 'Geldbeutel-Limiter',
-  wallet_limit_max_withdraw_per_day:
-    'Maximales tägliches Wallet-Auszahlungslimit in Sats (0 zum Deaktivieren)',
-  wallet_max_ballance:
-    'Maximales Guthaben der Wallet in Sats (0 zum Deaktivieren)',
-  wallet_limit_secs_between_trans:
-    'Mindestsekunden zwischen Transaktionen pro Wallet (0 zum Deaktivieren)',
   number_of_requests: 'Anzahl der Anfragen',
   time_unit: 'Zeiteinheit',
   minute: 'Minute',
@@ -219,7 +211,6 @@ window.localisation.de = {
   account_settings: 'Kontoeinstellungen',
   signin_with_google: 'Mit Google anmelden',
   signin_with_github: 'Anmelden mit GitHub',
-  signin_with_keycloak: 'Mit Keycloak anmelden',
   username_or_email: 'Benutzername oder E-Mail',
   password: 'Passwort',
   password_config: 'Passwortkonfiguration',
@@ -242,8 +233,5 @@ window.localisation.de = {
   auth_provider: 'Anbieter für Authentifizierung',
   my_account: 'Mein Konto',
   back: 'Zurück',
-  logout: 'Abmelden',
-  look_and_feel: 'Aussehen und Verhalten',
-  language: 'Sprache',
-  color_scheme: 'Farbschema'
+  logout: 'Abmelden'
 }

lnbits/static/i18n/en.js

@@ -59,10 +59,9 @@ window.localisation.en = {
   service_fee_tooltip:
     'Service fee charged by the LNbits server admin per outgoing transaction',
   toggle_darkmode: 'Toggle Dark Mode',
-  payment_reactions: 'Payment Reactions',
   view_swagger_docs: 'View LNbits Swagger API docs',
   api_docs: 'API docs',
-  api_keys_api_docs: 'Node URL, API keys and API docs',
+  api_keys_api_docs: 'API keys and API docs',
   lnbits_version: 'LNbits version',
   runs_on: 'Runs on',
   credit_hint: 'Press Enter to credit account',
@@ -97,12 +96,8 @@ window.localisation.en = {
     'This is an LNURL-withdraw QR code for slurping everything from this wallet. Do not share with anyone. It is compatible with balanceCheck and balanceNotify so your wallet may keep pulling the funds continuously from here after the first withdraw.',
   i_understand: 'I understand',
   copy_wallet_url: 'Copy wallet URL',
-  disclaimer_dialog_title: 'Important!',
-  disclaimer_dialog: `You *must* save your  login credentials to be able to access your wallet again.If you lose them, you will lose access to your wallet and funds.
-
-Find your  login credentials on your account settings page.
-
-This service is in BETA. LNbits holds no responsibility for loss of access to funds.`,
+  disclaimer_dialog:
+    'To ensure continuous access to your wallets, please remember to securely store your login credentials! Please visit the "My Account" page. This service is in BETA, and we hold no responsibility for people losing access to funds.',
   no_transactions: 'No transactions made yet',
   manage: 'Manage',
   extensions: 'Extensions',
@@ -189,12 +184,6 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
   allow_access_hint: 'Allow access by IP (will override blocked IPs)',
   enter_ip: 'Enter IP and hit enter',
   rate_limiter: 'Rate Limiter',
-  wallet_limiter: 'Wallet Limiter',
-  wallet_limit_max_withdraw_per_day:
-    'Max daily wallet withdrawal in sats (0 to disable)',
-  wallet_max_ballance: 'Wallet max balance in sats (0 to disable)',
-  wallet_limit_secs_between_trans:
-    'Min secs between transactions per wallet (0 to disable)',
   number_of_requests: 'Number of requests',
   time_unit: 'Time unit',
   minute: 'minute',
@@ -213,7 +202,6 @@ This service is in BETA. LNbits holds no responsibility for loss of access to fu
   account_settings: 'Account Settings',
   signin_with_google: 'Sign in with Google',
   signin_with_github: 'Sign in with GitHub',
-  signin_with_keycloak: 'Sign in with Keycloak',
   username_or_email: 'Username or Email',
   password: 'Password',
   password_config: 'Password Config',

lnbits/static/i18n/es.js

@@ -61,10 +61,9 @@ window.localisation.es = {
   service_fee_tooltip:
     'Comisión de servicio cobrada por el administrador del servidor LNbits por cada transacción saliente',
   toggle_darkmode: 'Cambiar modo oscuro',
-  payment_reactions: 'Reacciones de Pago',
   view_swagger_docs: 'Ver documentación de API de LNbits Swagger',
   api_docs: 'Documentación de API',
-  api_keys_api_docs: 'URL del nodo, claves de API y documentación de API',
+  api_keys_api_docs: 'Claves de API y documentación de API',
   lnbits_version: 'Versión de LNbits',
   runs_on: 'Corre en',
   credit_hint: 'Presione Enter para cargar la cuenta',
@@ -191,13 +190,6 @@ window.localisation.es = {
   allow_access_hint: 'Permitir acceso por IP (anulará las IPs bloqueadas)',
   enter_ip: 'Ingrese la IP y presione enter',
   rate_limiter: 'Limitador de tasa',
-  wallet_limiter: 'Limitador de Cartera',
-  wallet_limit_max_withdraw_per_day:
-    'Límite diario de retiro de la cartera en sats (0 para deshabilitar)',
-  wallet_max_ballance:
-    'Saldo máximo de la billetera en sats (0 para desactivar)',
-  wallet_limit_secs_between_trans:
-    'Mín. segs entre transacciones por cartera (0 para desactivar)',
   number_of_requests: 'Número de solicitudes',
   time_unit: 'Unidad de tiempo',
   minute: 'minuto',
@@ -217,7 +209,6 @@ window.localisation.es = {
   account_settings: 'Configuración de la cuenta',
   signin_with_google: 'Inicia sesión con Google',
   signin_with_github: 'Inicia sesión con GitHub',
-  signin_with_keycloak: 'Iniciar sesión con Keycloak',
   username_or_email: 'Nombre de usuario o correo electrónico',
   password: 'Contraseña',
   password_config: 'Configuración de Contraseña',
@@ -240,8 +231,5 @@ window.localisation.es = {
   auth_provider: 'Proveedor de Autenticación',
   my_account: 'Mi cuenta',
   back: 'Atrás',
-  logout: 'Cerrar sesión',
-  look_and_feel: 'Apariencia',
-  language: 'Idioma',
-  color_scheme: 'Esquema de colores'
+  logout: 'Cerrar sesión'
 }

lnbits/static/i18n/fi.js

@@ -37,7 +37,7 @@ window.localisation.fi = {
   paste_invoice_label:
     'Liitä lasku, maksupyyntö, lnurl-koodi tai Lightning Address *',
   lnbits_description:
-    'Kevyt ja helppokäyttöinen LNbits voi käyttää rahoituslähteinään erilaisia palveluita, kuten LND, Core Lightning, OpenNode, Alby, LNPay ja jopa itseään! Voit käyttää sitä itsenäisesti  ja helposti tarjota erilaisia Lightning-palveluita. Pystyt luomaan sillä salamaverkkolompakoita eikä niiden määrää ole rajoitettu. Jokaiselle lompakolle saat yksilölliset API-avaimet. Varojen osittaminen tekee siitä erittäin kätevän varojen hallinnassa sekä myös ohjelmistokehityksen työkalun. Laajennukset lisäävät LNbits:in toiminnallisuuksia. Näinpä voit helposti testailla useita erilaisia ja viimeisimpiä salamaverkon teknologioita. Laajennuksien kehittämisen olemme pyrkineet tekemään mahdollisimman helpoksi pitämällä LNbits:in ilmaisena OpenSource-projektina. Kannustamme kaikkia kehittämään ja jakelemaan omia laajennuksia!',
+    'Kevyt ja helppokäyttöinen LNbits soveltuu minkä tahansa salamaverkon rahoituslähteeksi. Se tukee rahoituslähteinä LND, Core Lightning, OpenNode, Alby, LNPay ja jopa itseään! Voi käyttää itsenäisesti sitä ja helposti tarjota säilytyspalveluita. Pystyt luomaan sillä salamaverkko lompakoita ja niiden määrää ei ole rajoitettu. Jokaiselle lompakolle saat iksilölliset AP avaimet. Varojen osittaminen tekee siitä erittäin kätevän varojen hallinnassa sekä myös ohjelmistokehityksen työkaluja. Laajennukset lisäävät LNbits:in toiminnallisuuksia. Näinpä voit helposti testailla useita erilaisia ja viimeisimpiä salamaverkon-teknologioita. Laajennuksien kehittämisen olemme pyrkineet tekemään hmahdollisimman helpoksi, ilmaisena OpenSource-projektina. Kannustamme kaikkia kehittämään ja jakelemaan omia laajennuksia!',
   export_to_phone: 'Käytä puhelimessa lukemalla QR-koodi',
   export_to_phone_desc:
     'Tämä QR-koodi sisältää URL-osoitteen, jolla saa lompakkoosi täydet valtuudet. Voi lukea sen puhelimellasi ja avata sillä lompakkosi. Voit myös lisätä lompakkosi selaimella käytettäväksi PWA-sovellukseksi puhelimen aloitusruudulle. ',
@@ -64,10 +64,9 @@ window.localisation.fi = {
   service_fee_tooltip:
     'LNBits palvelimen ylläpitäjä veloittaa lähtevästä maksusta palvelumaksun.',
   toggle_darkmode: 'Tumma näkymä',
-  toggle_reactions: 'Käytä tapahtuma efektejä',
   view_swagger_docs: 'Näytä LNbits Swagger API-dokumentit',
   api_docs: 'API-dokumentaatio',
-  api_keys_api_docs: 'Solmun URL, API-avaimet ja -dokumentaatio',
+  api_keys_api_docs: 'API-avaimet ja -dokumentaatio',
   lnbits_version: 'LNbits versio',
   runs_on: 'Mukana menossa',
   credit_hint: 'Hyväksy painamalla Enter',
@@ -105,9 +104,9 @@ window.localisation.fi = {
   disclaimer_dialog:
     'Muistathan tallettaa kirjautumistietosi turvallisesta ja helposti saataville, jotta pääset jatkossakin kirjautumaan lompakkoosi! Tutustu myös Tilin asetukset -sivuun. Tämä palvelu on kokeiluvaiheessa (eli BETA), ja niinpä kukaan ei ota mitään vastuuta varojen säilymisestä tai niiden käytettävyyden takaamisesta.',
   no_transactions: 'Lompakossa ei ole yhtään tapahtumaa',
-  manage: 'Hallinnointi',
+  manage: 'Hallinnoi',
   extensions: 'Laajennukset',
-  no_extensions: 'Laajennuksia ei ole asennettu :(',
+  no_extensions: 'Yhtään laajennusta ei ole asennettuna :(',
   created: 'Luotu',
   search_extensions: 'Etsi laajennuksia',
   warning: 'Varoitus',
@@ -191,12 +190,6 @@ window.localisation.fi = {
   allow_access_hint: 'Salli pääsy IP-osoitteen perusteella (ohittaa estot)',
   enter_ip: 'Anna IP ja paina +',
   rate_limiter: 'Toiston rajoitin',
-  wallet_limiter: 'Lompakon Rajoitin',
-  wallet_limit_max_withdraw_per_day:
-    'Maksimi päivittäinen lompakon nosto sateissa (0 poistaa käytöstä)',
-  wallet_max_ballance: 'Lompakon maksimisaldo satosheina (0 poistaa käytöstä)',
-  wallet_limit_secs_between_trans:
-    'Min sekuntia transaktioiden välillä lompakkoa kohden (0 poistaa käytöstä)',
   number_of_requests: 'Pyyntöjen lukumäärä',
   time_unit: 'aikayksikkö',
   minute: 'minuutti',
@@ -215,7 +208,6 @@ window.localisation.fi = {
   account_settings: 'Tilin asetukset',
   signin_with_google: 'Kirjaudu Google-tunnuksella',
   signin_with_github: 'Kirjaudu GitHub-tunnuksella',
-  signin_with_keycloak: 'Kirjaudu Keycloak-tunnuksella',
   username_or_email: 'Käyttäjänimi tai sähköposti',
   password: 'Anna uusi salasana',
   password_config: 'Salasanan määritys',

lnbits/static/i18n/fr.js

@@ -65,10 +65,9 @@ window.localisation.fr = {
   service_fee_tooltip:
     "Frais de service facturés par l'administrateur du serveur LNbits pour chaque transaction sortante",
   toggle_darkmode: 'Basculer le mode sombre',
-  payment_reactions: 'Réactions de paiement',
   view_swagger_docs: "Voir les documentation de l'API Swagger de LNbits",
   api_docs: "Documentation de l'API",
-  api_keys_api_docs: 'URL du nœud, clés API et documentation API',
+  api_keys_api_docs: "Clés API et documentation de l'API",
   lnbits_version: 'Version de LNbits',
   runs_on: 'Fonctionne sur',
   credit_hint: 'Appuyez sur Entrée pour créditer le compte',
@@ -196,13 +195,6 @@ window.localisation.fr = {
     "Autoriser l'accès par IP (cela passera outre les IP bloquées)",
   enter_ip: "Entrez l'adresse IP et appuyez sur Entrée",
   rate_limiter: 'Limiteur de débit',
-  wallet_limiter: 'Limiteur de portefeuille',
-  wallet_limit_max_withdraw_per_day:
-    'Retrait quotidien maximum du portefeuille en sats (0 pour désactiver)',
-  wallet_max_ballance:
-    'Solde maximum du portefeuille en sats (0 pour désactiver)',
-  wallet_limit_secs_between_trans:
-    'Minutes et secondes entre les transactions par portefeuille (0 pour désactiver)',
   number_of_requests: 'Nombre de requêtes',
   time_unit: 'Unité de temps',
   minute: 'minute',
@@ -221,7 +213,6 @@ window.localisation.fr = {
   account_settings: 'Paramètres du compte',
   signin_with_google: 'Connectez-vous avec Google',
   signin_with_github: 'Connectez-vous avec GitHub',
-  signin_with_keycloak: 'Connectez-vous avec Keycloak',
   username_or_email: "Nom d'utilisateur ou e-mail",
   password: 'Mot de passe',
   password_config: 'Configuration du mot de passe',
@@ -244,8 +235,5 @@ window.localisation.fr = {
   auth_provider: "Fournisseur d'authentification",
   my_account: 'Mon compte',
   back: 'Retour',
-  logout: 'Déconnexion',
-  look_and_feel: 'Apparence',
-  language: 'Langue',
-  color_scheme: 'Schéma de couleurs'
+  logout: 'Déconnexion'
 }

lnbits/static/i18n/it.js

@@ -62,10 +62,9 @@ window.localisation.it = {
   service_fee_tooltip:
     "Commissione di servizio addebitata dall'amministratore del server LNbits per ogni transazione in uscita",
   toggle_darkmode: 'Attiva la modalità notturna',
-  payment_reactions: 'Reazioni al Pagamento',
   view_swagger_docs: "Visualizza i documentazione dell'API Swagger di LNbits",
   api_docs: "Documentazione dell'API",
-  api_keys_api_docs: 'URL del nodo, chiavi API e documentazione API',
+  api_keys_api_docs: "Chiavi API e documentazione dell'API",
   lnbits_version: 'Versione di LNbits',
   runs_on: 'Esegue su',
   credit_hint: 'Premere Invio per accreditare i fondi',
@@ -192,13 +191,6 @@ window.localisation.it = {
     "Consenti l'accesso per IP (sovrascriverà gli IP bloccati)",
   enter_ip: "Inserisci l'IP e premi invio",
   rate_limiter: 'Limitatore di frequenza',
-  wallet_limiter: 'Limitatore del Portafoglio',
-  wallet_limit_max_withdraw_per_day:
-    'Prelievo massimo giornaliero dal portafoglio in sats (0 per disabilitare)',
-  wallet_max_ballance:
-    'Saldo massimo del portafoglio in sats (0 per disabilitare)',
-  wallet_limit_secs_between_trans:
-    'Minuti e secondi tra transazioni per portafoglio (0 per disabilitare)',
   number_of_requests: 'Numero di richieste',
   time_unit: 'Unità di tempo',
   minute: 'minuto',
@@ -218,7 +210,6 @@ window.localisation.it = {
   account_settings: "Impostazioni dell'account",
   signin_with_google: 'Accedi con Google',
   signin_with_github: 'Accedi con GitHub',
-  signin_with_keycloak: 'Accedi con Keycloak',
   username_or_email: 'Nome utente o Email',
   password: 'Password',
   password_config: 'Configurazione della password',
@@ -241,8 +232,5 @@ window.localisation.it = {
   auth_provider: 'Provider di Autenticazione',
   my_account: 'Il mio account',
   back: 'Indietro',
-  logout: 'Esci',
-  look_and_feel: 'Aspetto e Comportamento',
-  language: 'Lingua',
-  color_scheme: 'Schema dei colori'
+  logout: 'Esci'
 }

lnbits/static/i18n/jp.js

@@ -59,10 +59,9 @@ window.localisation.jp = {
   service_fee_max: '取引手数料：%{amount}%（最大%{max}サトシ）',
   service_fee_tooltip: 'LNbitsサーバー管理者が発生する送金ごとの手数料',
   toggle_darkmode: 'ダークモードを切り替える',
-  payment_reactions: '支払いの反応',
   view_swagger_docs: 'Swaggerドキュメントを表示',
   api_docs: 'APIドキュメント',
-  api_keys_api_docs: 'ノードURL、APIキー、APIドキュメント',
+  api_keys_api_docs: 'APIキーとAPIドキュメント',
   lnbits_version: 'LNbits バージョン',
   runs_on: 'で実行',
   credit_hint:
@@ -189,12 +188,6 @@ window.localisation.jp = {
     'IPによるアクセスを許可する（ブロックされたIPを上書きします）',
   enter_ip: 'IPを入力してエンターキーを押してください',
   rate_limiter: 'レートリミッター',
-  wallet_limiter: 'ウォレットリミッター',
-  wallet_limit_max_withdraw_per_day:
-    '1日あたりの最大ウォレット出金額をsatsで入力してください（0 で無効）。',
-  wallet_max_ballance: 'ウォレットの最大残高（sats）（0は無効）',
-  wallet_limit_secs_between_trans:
-    'トランザクション間の最小秒数（ウォレットごと）（0は無効）',
   number_of_requests: 'リクエストの数',
   time_unit: '時間単位',
   minute: '分',
@@ -214,7 +207,6 @@ window.localisation.jp = {
   account_settings: 'アカウント設定',
   signin_with_google: 'Googleでサインイン',
   signin_with_github: 'GitHubでサインイン',
-  signin_with_keycloak: 'Keycloakでサインイン',
   username_or_email: 'ユーザー名またはメールアドレス',
   password: 'パスワード',
   password_config: 'パスワード設定',
@@ -237,8 +229,5 @@ window.localisation.jp = {
   auth_provider: '認証プロバイダ',
   my_account: 'マイアカウント',
   back: '戻る',
-  logout: 'ログアウト',
-  look_and_feel: 'ルック・アンド・フィール',
-  language: '言語',
-  color_scheme: 'カラースキーム'
+  logout: 'ログアウト'
 }

lnbits/static/i18n/kr.js

@@ -60,10 +60,9 @@ window.localisation.kr = {
   service_fee_tooltip:
     '지불 결제 시마다 LNBits 서버 관리자에게 납부되는 서비스 수수료',
   toggle_darkmode: '다크 모드 전환',
-  payment_reactions: '결제 반응',
   view_swagger_docs: 'LNbits Swagger API 문서를 봅니다',
   api_docs: 'API 문서',
-  api_keys_api_docs: '노드 URL, API 키와 API 문서',
+  api_keys_api_docs: 'API 키와 API 문서',
   lnbits_version: 'LNbits 버전',
   runs_on: 'Runs on',
   credit_hint: '계정에 자금을 넣으려면 Enter를 눌러주세요',
@@ -188,11 +187,6 @@ window.localisation.kr = {
   allow_access_hint: 'IP 기준으로 접속 허용하기 (차단한 IP들을 무시합니다)',
   enter_ip: 'IP 주소를 입력하고 Enter를 눌러주세요',
   rate_limiter: '횟수로 제한하기',
-  wallet_limiter: '지갑 제한기',
-  wallet_limit_max_withdraw_per_day:
-    '일일 최대 지갑 출금액(sats) (0은 비활성화)',
-  wallet_max_ballance: '지갑 최대 잔액(sats) (0은 비활성화)',
-  wallet_limit_secs_between_trans: '지갑 당 거래 사이 최소 초 (0은 비활성화)',
   number_of_requests: '요청 횟수',
   time_unit: '시간 단위',
   minute: '분',
@@ -211,7 +205,6 @@ window.localisation.kr = {
   account_settings: '계정 설정',
   signin_with_google: 'Google으로 로그인',
   signin_with_github: 'GitHub으로 로그인',
-  signin_with_keycloak: 'Keycloak으로 로그인',
   username_or_email: '사용자 이름 또는 이메일',
   password: '비밀번호',
   password_config: '비밀번호 설정',
@@ -234,8 +227,5 @@ window.localisation.kr = {
   auth_provider: '인증 제공자',
   my_account: '내 계정',
   back: '뒤로',
-  logout: '로그아웃',
-  look_and_feel: '외관과 느낌',
-  language: '언어',
-  color_scheme: '색상 구성'
+  logout: '로그아웃'
 }

lnbits/static/i18n/nl.js

@@ -63,10 +63,9 @@ window.localisation.nl = {
   service_fee_tooltip:
     'Transactiekosten in rekening gebracht door de LNbits serverbeheerder per uitgaande transactie',
   toggle_darkmode: 'Donkere modus aan/uit',
-  payment_reactions: 'Betalingsreacties',
   view_swagger_docs: 'Bekijk LNbits Swagger API-documentatie',
   api_docs: 'API-documentatie',
-  api_keys_api_docs: 'Node URL, API-sleutels en API-documentatie',
+  api_keys_api_docs: 'API-sleutels en API-documentatie',
   lnbits_version: 'LNbits-versie',
   runs_on: 'Draait op',
   credit_hint: 'Druk op Enter om de rekening te crediteren',
@@ -192,13 +191,6 @@ window.localisation.nl = {
     "Toegang verlenen op basis van IP (zal geblokkeerde IP's overschrijven)",
   enter_ip: 'Voer IP in en druk op enter',
   rate_limiter: 'Snelheidsbegrenzer',
-  wallet_limiter: 'Portemonnee Limietsteller',
-  wallet_limit_max_withdraw_per_day:
-    'Maximale dagelijkse opname van wallet in sats (0 om uit te schakelen)',
-  wallet_max_ballance:
-    'Maximale portefeuillesaldo in sats (0 om uit te schakelen)',
-  wallet_limit_secs_between_trans:
-    'Min seconden tussen transacties per portemonnee (0 om uit te schakelen)',
   number_of_requests: 'Aantal verzoeken',
   time_unit: 'Tijdeenheid',
   minute: 'minuut',
@@ -217,7 +209,6 @@ window.localisation.nl = {
   account_settings: 'Accountinstellingen',
   signin_with_google: 'Inloggen met Google',
   signin_with_github: 'Inloggen met GitHub',
-  signin_with_keycloak: 'Inloggen met Keycloak',
   username_or_email: 'Gebruikersnaam of e-mail',
   password: 'Wachtwoord',
   password_config: 'Wachtwoordconfiguratie',
@@ -240,8 +231,5 @@ window.localisation.nl = {
   auth_provider: 'Auth Provider',
   my_account: 'Mijn Account',
   back: 'Terug',
-  logout: 'Afmelden',
-  look_and_feel: 'Uiterlijk en gedrag',
-  language: 'Taal',
-  color_scheme: 'Kleurenschema'
+  logout: 'Afmelden'
 }

lnbits/static/i18n/pi.js

@@ -61,10 +61,9 @@ window.localisation.pi = {
   service_fee_tooltip:
     "Service fee charged by the LNbits server admin per goin' transaction",
   toggle_darkmode: 'Toggle Dark Mode, arr!',
-  payment_reactions: 'Payment Reactions',
   view_swagger_docs: 'View LNbits Swagger API docs and learn the secrets',
   api_docs: 'API docs for the scallywags',
-  api_keys_api_docs: 'Node URL, API keys and API docs',
+  api_keys_api_docs: 'API keys and API docs',
   lnbits_version: 'LNbits version, arr!',
   runs_on: 'Runs on, matey',
   credit_hint: 'Press Enter to credit account and make it richer',
@@ -190,12 +189,6 @@ window.localisation.pi = {
   allow_access_hint: 'Grant permission by IP (will override barred IPs)',
   enter_ip: 'Enter IP and hit enter',
   rate_limiter: 'Rate Limiter',
-  wallet_limiter: 'Pouch Limitar',
-  wallet_limit_max_withdraw_per_day:
-    'Max daily wallet withdrawal in sats (0 ter disable)',
-  wallet_max_ballance: 'Purse max heaviness in sats (0 fer scuttle)',
-  wallet_limit_secs_between_trans:
-    "Min secs 'tween transactions per wallet (0 to disable)",
   number_of_requests: "Number o' requests",
   time_unit: "time bein'",
   minute: 'minnit',
@@ -214,7 +207,6 @@ window.localisation.pi = {
   account_settings: "Account Settin's",
   signin_with_google: "Sign in wit' Google",
   signin_with_github: "Sign in wit' GitHub",
-  signin_with_keycloak: "Sign in wit' Keycloak",
   username_or_email: 'Usarrrname or Email',
   password: 'Passwarrd',
   password_config: 'Passwarrd Config',
@@ -237,8 +229,5 @@ window.localisation.pi = {
   auth_provider: 'Auth Provider becometh Auth Provider, ye see?',
   my_account: 'Me Arrrccount',
   back: 'Return',
-  logout: 'Log out yer session',
-  look_and_feel: 'Look and Feel',
-  language: 'Langwidge',
-  color_scheme: 'Colour Scheme'
+  logout: 'Log out yer session'
 }

lnbits/static/i18n/pl.js

@@ -60,10 +60,9 @@ window.localisation.pl = {
   service_fee_tooltip:
     'Opłata serwisowa pobierana przez administratora serwera LNbits za każdą wychodzącą transakcję',
   toggle_darkmode: 'Tryb nocny',
-  payment_reactions: 'Reakcje na płatność',
   view_swagger_docs: 'Dokumentacja Swagger API',
   api_docs: 'Dokumentacja API',
-  api_keys_api_docs: 'Adres URL węzła, klucze API i dokumentacja API',
+  api_keys_api_docs: 'Klucze API i dokumentacja API',
   lnbits_version: 'Wersja LNbits',
   runs_on: 'Działa na',
   credit_hint: 'Naciśnij Enter aby doładować konto',
@@ -189,12 +188,6 @@ window.localisation.pl = {
     'Zezwól na dostęp przez IP (zignoruje zablokowane adresy IP)',
   enter_ip: 'Wpisz adres IP i naciśnij enter',
   rate_limiter: 'Ogranicznik Częstotliwości',
-  wallet_limiter: 'Ogranicznik Portfela',
-  wallet_limit_max_withdraw_per_day:
-    'Maksymalna dzienna wypłata z portfela w satoshi (0 aby wyłączyć)',
-  wallet_max_ballance: 'Maksymalny stan portfela w satoshi (0 aby wyłączyć)',
-  wallet_limit_secs_between_trans:
-    'Min sekund pomiędzy transakcjami na portfel (0 aby wyłączyć)',
   number_of_requests: 'Liczba żądań',
   time_unit: 'Jednostka czasu',
   minute: 'minuta',
@@ -213,7 +206,6 @@ window.localisation.pl = {
   account_settings: 'Ustawienia konta',
   signin_with_google: 'Zaloguj się przez Google',
   signin_with_github: 'Zaloguj się przez GitHub',
-  signin_with_keycloak: 'Zaloguj się przez Keycloak',
   username_or_email: 'Nazwa użytkownika lub Email',
   password: 'Hasło',
   password_config: 'Konfiguracja Hasła',
@@ -236,8 +228,5 @@ window.localisation.pl = {
   auth_provider: 'Dostawca uwierzytelniania',
   my_account: 'Moje Konto',
   back: 'Wstecz',
-  logout: 'Wyloguj',
-  look_and_feel: 'Wygląd i zachowanie',
-  language: 'Język',
-  color_scheme: 'Schemat kolorów'
+  logout: 'Wyloguj'
 }

lnbits/static/i18n/pt.js

@@ -61,10 +61,9 @@ window.localisation.pt = {
   service_fee_tooltip:
     'Taxa de serviço cobrada pelo administrador do servidor LNbits por transação de saída',
   toggle_darkmode: 'Alternar modo escuro',
-  payment_reactions: 'Reações de Pagamento',
   view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
   api_docs: 'Documentação da API',
-  api_keys_api_docs: 'URL do Nó, chaves de API e documentação de API',
+  api_keys_api_docs: 'Chaves de API e documentação de API',
   lnbits_version: 'Versão do LNbits',
   runs_on: 'Executa em',
   credit_hint: 'Pressione Enter para creditar a conta',
@@ -190,12 +189,6 @@ window.localisation.pt = {
   allow_access_hint: 'Permitir acesso por IP (substituirá IPs bloqueados)',
   enter_ip: 'Digite o IP e pressione enter.',
   rate_limiter: 'Limitador de Taxa',
-  wallet_limiter: 'Limitador de Carteira',
-  wallet_limit_max_withdraw_per_day:
-    'Limite diário máximo de saque da carteira em sats (0 para desativar)',
-  wallet_max_ballance: 'Saldo máximo da carteira em sats (0 para desativar)',
-  wallet_limit_secs_between_trans:
-    'Minutos seg. entre transações por carteira (0 para desativar)',
   number_of_requests: 'Número de solicitações',
   time_unit: 'Unidade de tempo',
   minute: 'minuto',
@@ -214,7 +207,6 @@ window.localisation.pt = {
   account_settings: 'Configurações da Conta',
   signin_with_google: 'Entrar com o Google',
   signin_with_github: 'Entrar com o GitHub',
-  signin_with_keycloak: 'Entrar com o Keycloak',
   username_or_email: 'Nome de usuário ou Email',
   password: 'Senha',
   password_config: 'Configuração de Senha',
@@ -237,8 +229,5 @@ window.localisation.pt = {
   auth_provider: 'Provedor de Autenticação',
   my_account: 'Minha Conta',
   back: 'Voltar',
-  logout: 'Sair',
-  look_and_feel: 'Aparência e Sensação',
-  language: 'Idioma',
-  color_scheme: 'Esquema de Cores'
+  logout: 'Sair'
 }

lnbits/static/i18n/sk.js

@@ -60,10 +60,9 @@ window.localisation.sk = {
   service_fee_tooltip:
     'Servisný poplatok účtovaný správcom LNbits servera za odchádzajúcu transakciu',
   toggle_darkmode: 'Prepnúť Tmavý režim',
-  payment_reactions: 'Reakcie na platbu',
   view_swagger_docs: 'Zobraziť LNbits Swagger API dokumentáciu',
   api_docs: 'API dokumentácia',
-  api_keys_api_docs: 'Adresa uzla, API kľúče a API dokumentácia',
+  api_keys_api_docs: 'API kľúče a API dokumentácia',
   lnbits_version: 'Verzia LNbits',
   runs_on: 'Beží na',
   credit_hint: 'Stlačte Enter pre pripísanie na účet',
@@ -188,13 +187,6 @@ window.localisation.sk = {
   allow_access_hint: 'Povoliť prístup podľa IP (prebije blokované IP)',
   enter_ip: 'Zadajte IP a stlačte enter',
   rate_limiter: 'Obmedzovač počtu požiadaviek',
-  wallet_limiter: 'Obmedzovač peňaženky',
-  wallet_limit_max_withdraw_per_day:
-    'Maximálny denný výber z peňaženky v satošiach (0 pre zrušenie)',
-  wallet_max_ballance:
-    'Maximálny zostatok v peňaženke v satošiach (0 pre deaktiváciu)',
-  wallet_limit_secs_between_trans:
-    'Minimálny počet sekúnd medzi transakciami na peňaženku (0 na deaktiváciu)',
   number_of_requests: 'Počet požiadaviek',
   time_unit: 'Časová jednotka',
   minute: 'minúta',
@@ -211,9 +203,8 @@ window.localisation.sk = {
   login_to_account: 'Prihláste sa do vášho účtu',
   create_account: 'Vytvoriť účet',
   account_settings: 'Nastavenia účtu',
-  signin_with_google: 'Prihlásiť sa pomocou Google',
-  signin_with_github: 'Prihlásiť sa pomocou GitHub',
-  signin_with_keycloak: 'Prihlásiť sa pomocou Keycloak',
+  signin_with_google: 'Prihlásiť sa cez Google',
+  signin_with_github: 'Prihláste sa pomocou GitHub',
   username_or_email: 'Používateľské meno alebo email',
   password: 'Heslo',
   password_config: 'Konfigurácia hesla',
@@ -236,8 +227,5 @@ window.localisation.sk = {
   auth_provider: 'Poskytovateľ autentifikácie',
   my_account: 'Môj účet',
   back: 'Späť',
-  logout: 'Odhlásiť sa',
-  look_and_feel: 'Vzhľad a dojem',
-  language: 'Jazyk',
-  color_scheme: 'Farebná schéma'
+  logout: 'Odhlásiť sa'
 }

lnbits/static/i18n/we.js

@@ -61,10 +61,9 @@ window.localisation.we = {
   service_fee_tooltip:
     "Ffi gwasanaeth a godir gan weinyddwr gweinydd LNbits ym mhob trafodiad sy'n mynd allan",
   toggle_darkmode: 'Toglo Modd Tywyll',
-  payment_reactions: 'Adweithiau Talu',
   view_swagger_docs: 'Gweld dogfennau API LNbits Swagger',
   api_docs: 'Dogfennau API',
-  api_keys_api_docs: 'URL y nod, allweddi API a dogfennau API',
+  api_keys_api_docs: 'Allweddi API a dogfennau API',
   lnbits_version: 'Fersiwn LNbits',
   runs_on: 'Yn rhedeg ymlaen',
   credit_hint: 'Pwyswch Enter i gyfrif credyd',
@@ -189,12 +188,6 @@ window.localisation.we = {
     "Caniatáu mynediad gan IP (bydd yn diystyru IPs sydd wedi'u blocio)",
   enter_ip: 'Rhowch IP a gwasgwch enter',
   rate_limiter: 'Cyfyngydd Cyfradd',
-  wallet_limiter: 'Cyfyngwr Waled',
-  wallet_limit_max_withdraw_per_day:
-    'Uchafswm tynnu’n ôl waled dyddiol mewn sats (0 i analluogi)',
-  wallet_max_ballance: 'Uchafswm balans y waled mewn sats (0 i analluogi)',
-  wallet_limit_secs_between_trans:
-    'Eiliadau lleiaf rhwng trafodion fesul waled (0 i analluogi)',
   number_of_requests: 'Nifer y ceisiadau',
   time_unit: 'Uned amser',
   minute: 'munud',
@@ -213,7 +206,6 @@ window.localisation.we = {
   account_settings: 'Gosodiadau Cyfrif',
   signin_with_google: 'Mewngofnodi gyda Google',
   signin_with_github: 'Mewngofnodi gyda GitHub',
-  signin_with_keycloak: 'Mewngofnodi gyda Keycloak',
   username_or_email: 'Defnyddiwr neu E-bost',
   password: 'Cyfrinair',
   password_config: 'Ffurfweddiad Cyfrinair',
@@ -236,8 +228,5 @@ window.localisation.we = {
   auth_provider: 'Darparwr Dilysiad',
   my_account: 'Fy Nghyfrif',
   back: 'Yn ôl',
-  logout: 'Allgofnodi',
-  look_and_feel: 'Edrych a Theimlo',
-  language: 'Iaith',
-  color_scheme: 'Cynllun Lliw'
+  logout: 'Allgofnodi'
 }

lnbits/static/js/account.js

@@ -6,12 +6,6 @@ new Vue({
       user: null,
       hasUsername: false,
       showUserId: false,
-      reactionOptions: [
-        'None',
-        'confettiBothSides',
-        'confettiFireworks',
-        'confettiStars'
-      ],
       tab: 'user',
       passwordData: {
         show: false,
@@ -33,9 +27,6 @@ new Vue({
       this.$q.dark.toggle()
       this.$q.localStorage.set('lnbits.darkMode', this.$q.dark.isActive)
     },
-    reactionChoiceFunc: function () {
-      this.$q.localStorage.set('lnbits.reactions', this.reactionChoice)
-    },
     changeColor: function (newValue) {
       document.body.setAttribute('data-theme', newValue)
       this.$q.localStorage.set('lnbits.theme', newValue)

lnbits/static/js/base.js

@@ -168,6 +168,7 @@ window.LNbits = {
       let listener = ev => {
         cb(JSON.parse(ev.data))
       }
+
       this.listenersCount = this.listenersCount || {[wallet.inkey]: 0}
       this.listenersCount[wallet.inkey]++
 
@@ -443,7 +444,6 @@ window.windowMixin = {
   data: function () {
     return {
       toggleSubs: true,
-      reactionChoice: 'confettiBothSides',
       isUserAuthorized: false,
       g: {
         offline: !navigator.onLine,
@@ -523,9 +523,6 @@ window.windowMixin = {
     } else {
       this.$q.dark.set(true)
     }
-    this.reactionChoice =
-      this.$q.localStorage.getItem('lnbits.reactions') || 'confettiBothSides'
-
     this.g.allowedThemes = window.allowedThemes ?? ['bitcoin']
 
     let locale = this.$q.localStorage.getItem('lnbits.lang')

lnbits/static/js/event-reactions.js

@@ -1,560 +0,0 @@
-function eventReactionWebocket(event_id) {
-  localUrl = ''
-  reaction = localStorage.getItem('lnbits.reactions')
-  if (!reaction || reaction === 'None') {
-    return
-  }
-  if (location.protocol !== 'http:') {
-    localUrl = 'wss://' + location.host + '/api/v1/ws/' + event_id
-  } else {
-    localUrl = 'ws://' + location.host + '/api/v1/ws/' + event_id
-  }
-  connection = new WebSocket(localUrl)
-  connection.onmessage = function (e) {
-    try {
-      const parsedData = JSON.parse(e.data)
-      if (parsedData.payment.amount < 0) {
-        return
-      }
-      reaction = localStorage.getItem('lnbits.reactions')
-      if (reaction) {
-        window[reaction.split('|')[1]]()
-      }
-    } catch (e) {
-      console.log(e)
-    }
-  }
-}
-function confettiBothSides() {
-  document.getElementById('vue').disabled = true
-  var end = Date.now() + 2 * 1000
-  var colors = ['#FFD700', '#ffffff']
-  function frame() {
-    confetti({
-      particleCount: 2,
-      angle: 60,
-      spread: 55,
-      origin: {x: 0},
-      colors: colors,
-      zIndex: 999999
-    })
-    confetti({
-      particleCount: 2,
-      angle: 120,
-      spread: 55,
-      origin: {x: 1},
-      colors: colors,
-      zIndex: 999999
-    })
-    if (Date.now() < end) {
-      requestAnimationFrame(frame)
-    } else {
-      document.getElementById('vue').disabled = false
-    }
-  }
-  frame()
-}
-function confettiFireworks() {
-  var duration = 3 * 1000
-  var animationEnd = Date.now() + duration
-  var defaults = {startVelocity: 30, spread: 360, ticks: 60, zIndex: 0}
-
-  function randomInRange(min, max) {
-    return Math.random() * (max - min) + min
-  }
-
-  var interval = setInterval(function () {
-    var timeLeft = animationEnd - Date.now()
-
-    if (timeLeft <= 0) {
-      return clearInterval(interval)
-    }
-
-    var particleCount = 5 * (timeLeft / duration)
-    // since particles fall down, start a bit higher than random
-    confetti({
-      ...defaults,
-      particleCount,
-      origin: {x: randomInRange(0.1, 0.3), y: Math.random() - 0.2}
-    })
-    confetti({
-      ...defaults,
-      particleCount,
-      origin: {x: randomInRange(0.7, 0.9), y: Math.random() - 0.2}
-    })
-  }, 250)
-}
-
-function confettiStars() {
-  var defaults = {
-    spread: 360,
-    ticks: 50,
-    gravity: 0,
-    decay: 0.94,
-    startVelocity: 30,
-    colors: ['FFE400', 'FFBD00', 'E89400', 'FFCA6C', 'FDFFB8']
-  }
-
-  function shoot() {
-    confetti({
-      ...defaults,
-      particleCount: 40,
-      scalar: 1.2,
-      shapes: ['star']
-    })
-
-    confetti({
-      ...defaults,
-      particleCount: 10,
-      scalar: 0.75,
-      shapes: ['circle']
-    })
-  }
-
-  setTimeout(shoot, 0)
-  setTimeout(shoot, 100)
-  setTimeout(shoot, 200)
-  setTimeout(shoot, 0)
-  setTimeout(shoot, 100)
-  setTimeout(shoot, 200)
-}
-!(function (t, e) {
-  !(function t(e, n, a, i) {
-    var o = !!(
-      e.Worker &&
-      e.Blob &&
-      e.Promise &&
-      e.OffscreenCanvas &&
-      e.OffscreenCanvasRenderingContext2D &&
-      e.HTMLCanvasElement &&
-      e.HTMLCanvasElement.prototype.transferControlToOffscreen &&
-      e.URL &&
-      e.URL.createObjectURL
-    )
-    function r() {}
-    function l(t) {
-      var a = n.exports.Promise,
-        i = void 0 !== a ? a : e.Promise
-      return 'function' == typeof i ? new i(t) : (t(r, r), null)
-    }
-    var c,
-      s,
-      u,
-      d,
-      f,
-      h,
-      g,
-      m,
-      b =
-        ((u = Math.floor(1e3 / 60)),
-        (d = {}),
-        (f = 0),
-        'function' == typeof requestAnimationFrame &&
-        'function' == typeof cancelAnimationFrame
-          ? ((c = function (t) {
-              var e = Math.random()
-              return (
-                (d[e] = requestAnimationFrame(function n(a) {
-                  f === a || f + u - 1 < a
-                    ? ((f = a), delete d[e], t())
-                    : (d[e] = requestAnimationFrame(n))
-                })),
-                e
-              )
-            }),
-            (s = function (t) {
-              d[t] && cancelAnimationFrame(d[t])
-            }))
-          : ((c = function (t) {
-              return setTimeout(t, u)
-            }),
-            (s = function (t) {
-              return clearTimeout(t)
-            })),
-        {frame: c, cancel: s}),
-      v =
-        ((m = {}),
-        function () {
-          if (h) return h
-          if (!a && o) {
-            var e = [
-              'var CONFETTI, SIZE = {}, module = {};',
-              '(' + t.toString() + ')(this, module, true, SIZE);',
-              'onmessage = function(msg) {',
-              '  if (msg.data.options) {',
-              '    CONFETTI(msg.data.options).then(function () {',
-              '      if (msg.data.callback) {',
-              '        postMessage({ callback: msg.data.callback });',
-              '      }',
-              '    });',
-              '  } else if (msg.data.reset) {',
-              '    CONFETTI.reset();',
-              '  } else if (msg.data.resize) {',
-              '    SIZE.width = msg.data.resize.width;',
-              '    SIZE.height = msg.data.resize.height;',
-              '  } else if (msg.data.canvas) {',
-              '    SIZE.width = msg.data.canvas.width;',
-              '    SIZE.height = msg.data.canvas.height;',
-              '    CONFETTI = module.exports.create(msg.data.canvas);',
-              '  }',
-              '}'
-            ].join('\n')
-            try {
-              h = new Worker(URL.createObjectURL(new Blob([e])))
-            } catch (t) {
-              return (
-                void 0 !== typeof console &&
-                  'function' == typeof console.warn &&
-                  console.warn('🎊 Could not load worker', t),
-                null
-              )
-            }
-            !(function (t) {
-              function e(e, n) {
-                t.postMessage({options: e || {}, callback: n})
-              }
-              ;(t.init = function (e) {
-                var n = e.transferControlToOffscreen()
-                t.postMessage({canvas: n}, [n])
-              }),
-                (t.fire = function (n, a, i) {
-                  if (g) return e(n, null), g
-                  var o = Math.random().toString(36).slice(2)
-                  return (g = l(function (a) {
-                    function r(e) {
-                      e.data.callback === o &&
-                        (delete m[o],
-                        t.removeEventListener('message', r),
-                        (g = null),
-                        i(),
-                        a())
-                    }
-                    t.addEventListener('message', r),
-                      e(n, o),
-                      (m[o] = r.bind(null, {data: {callback: o}}))
-                  }))
-                }),
-                (t.reset = function () {
-                  for (var e in (t.postMessage({reset: !0}), m))
-                    m[e](), delete m[e]
-                })
-            })(h)
-          }
-          return h
-        }),
-      y = {
-        particleCount: 50,
-        angle: 90,
-        spread: 45,
-        startVelocity: 45,
-        decay: 0.9,
-        gravity: 1,
-        drift: 0,
-        ticks: 200,
-        x: 0.5,
-        y: 0.5,
-        shapes: ['square', 'circle'],
-        zIndex: 100,
-        colors: [
-          '#26ccff',
-          '#a25afd',
-          '#ff5e7e',
-          '#88ff5a',
-          '#fcff42',
-          '#ffa62d',
-          '#ff36ff'
-        ],
-        disableForReducedMotion: !1,
-        scalar: 1
-      }
-    function p(t, e, n) {
-      return (function (t, e) {
-        return e ? e(t) : t
-      })(t && null != t[e] ? t[e] : y[e], n)
-    }
-    function M(t) {
-      return t < 0 ? 0 : Math.floor(t)
-    }
-    function w(t) {
-      return parseInt(t, 16)
-    }
-    function x(t) {
-      return t.map(C)
-    }
-    function C(t) {
-      var e = String(t).replace(/[^0-9a-f]/gi, '')
-      return (
-        e.length < 6 && (e = e[0] + e[0] + e[1] + e[1] + e[2] + e[2]),
-        {
-          r: w(e.substring(0, 2)),
-          g: w(e.substring(2, 4)),
-          b: w(e.substring(4, 6))
-        }
-      )
-    }
-    function k(t) {
-      ;(t.width = document.documentElement.clientWidth),
-        (t.height = document.documentElement.clientHeight)
-    }
-    function I(t) {
-      var e = t.getBoundingClientRect()
-      ;(t.width = e.width), (t.height = e.height)
-    }
-    function T(t, e, n, o, r) {
-      var c,
-        s,
-        u = e.slice(),
-        d = t.getContext('2d'),
-        f = l(function (e) {
-          function l() {
-            ;(c = s = null), d.clearRect(0, 0, o.width, o.height), r(), e()
-          }
-          ;(c = b.frame(function e() {
-            !a ||
-              (o.width === i.width && o.height === i.height) ||
-              ((o.width = t.width = i.width), (o.height = t.height = i.height)),
-              o.width ||
-                o.height ||
-                (n(t), (o.width = t.width), (o.height = t.height)),
-              d.clearRect(0, 0, o.width, o.height),
-              (u = u.filter(function (t) {
-                return (function (t, e) {
-                  ;(e.x += Math.cos(e.angle2D) * e.velocity + e.drift),
-                    (e.y += Math.sin(e.angle2D) * e.velocity + e.gravity),
-                    (e.wobble += 0.1),
-                    (e.velocity *= e.decay),
-                    (e.tiltAngle += 0.1),
-                    (e.tiltSin = Math.sin(e.tiltAngle)),
-                    (e.tiltCos = Math.cos(e.tiltAngle)),
-                    (e.random = Math.random() + 5),
-                    (e.wobbleX = e.x + 10 * e.scalar * Math.cos(e.wobble)),
-                    (e.wobbleY = e.y + 10 * e.scalar * Math.sin(e.wobble))
-                  var n = e.tick++ / e.totalTicks,
-                    a = e.x + e.random * e.tiltCos,
-                    i = e.y + e.random * e.tiltSin,
-                    o = e.wobbleX + e.random * e.tiltCos,
-                    r = e.wobbleY + e.random * e.tiltSin
-                  return (
-                    (t.fillStyle =
-                      'rgba(' +
-                      e.color.r +
-                      ', ' +
-                      e.color.g +
-                      ', ' +
-                      e.color.b +
-                      ', ' +
-                      (1 - n) +
-                      ')'),
-                    t.beginPath(),
-                    'circle' === e.shape
-                      ? t.ellipse
-                        ? t.ellipse(
-                            e.x,
-                            e.y,
-                            Math.abs(o - a) * e.ovalScalar,
-                            Math.abs(r - i) * e.ovalScalar,
-                            (Math.PI / 10) * e.wobble,
-                            0,
-                            2 * Math.PI
-                          )
-                        : (function (t, e, n, a, i, o, r, l, c) {
-                            t.save(),
-                              t.translate(e, n),
-                              t.rotate(o),
-                              t.scale(a, i),
-                              t.arc(0, 0, 1, r, l, c),
-                              t.restore()
-                          })(
-                            t,
-                            e.x,
-                            e.y,
-                            Math.abs(o - a) * e.ovalScalar,
-                            Math.abs(r - i) * e.ovalScalar,
-                            (Math.PI / 10) * e.wobble,
-                            0,
-                            2 * Math.PI
-                          )
-                      : (t.moveTo(Math.floor(e.x), Math.floor(e.y)),
-                        t.lineTo(Math.floor(e.wobbleX), Math.floor(i)),
-                        t.lineTo(Math.floor(o), Math.floor(r)),
-                        t.lineTo(Math.floor(a), Math.floor(e.wobbleY))),
-                    t.closePath(),
-                    t.fill(),
-                    e.tick < e.totalTicks
-                  )
-                })(d, t)
-              })).length
-                ? (c = b.frame(e))
-                : l()
-          })),
-            (s = l)
-        })
-      return {
-        addFettis: function (t) {
-          return (u = u.concat(t)), f
-        },
-        canvas: t,
-        promise: f,
-        reset: function () {
-          c && b.cancel(c), s && s()
-        }
-      }
-    }
-    function E(t, n) {
-      var a,
-        i = !t,
-        r = !!p(n || {}, 'resize'),
-        c = p(n, 'disableForReducedMotion', Boolean),
-        s = o && !!p(n || {}, 'useWorker') ? v() : null,
-        u = i ? k : I,
-        d = !(!t || !s) && !!t.__confetti_initialized,
-        f =
-          'function' == typeof matchMedia &&
-          matchMedia('(prefers-reduced-motion)').matches
-      function h(e, n, i) {
-        for (
-          var o,
-            r,
-            l,
-            c,
-            s,
-            d = p(e, 'particleCount', M),
-            f = p(e, 'angle', Number),
-            h = p(e, 'spread', Number),
-            g = p(e, 'startVelocity', Number),
-            m = p(e, 'decay', Number),
-            b = p(e, 'gravity', Number),
-            v = p(e, 'drift', Number),
-            y = p(e, 'colors', x),
-            w = p(e, 'ticks', Number),
-            C = p(e, 'shapes'),
-            k = p(e, 'scalar'),
-            I = (function (t) {
-              var e = p(t, 'origin', Object)
-              return (e.x = p(e, 'x', Number)), (e.y = p(e, 'y', Number)), e
-            })(e),
-            E = d,
-            S = [],
-            F = t.width * I.x,
-            N = t.height * I.y;
-          E--;
-
-        )
-          S.push(
-            ((o = {
-              x: F,
-              y: N,
-              angle: f,
-              spread: h,
-              startVelocity: g,
-              color: y[E % y.length],
-              shape:
-                C[
-                  ((c = 0),
-                  (s = C.length),
-                  Math.floor(Math.random() * (s - c)) + c)
-                ],
-              ticks: w,
-              decay: m,
-              gravity: b,
-              drift: v,
-              scalar: k
-            }),
-            (r = void 0),
-            (l = void 0),
-            (r = o.angle * (Math.PI / 180)),
-            (l = o.spread * (Math.PI / 180)),
-            {
-              x: o.x,
-              y: o.y,
-              wobble: 10 * Math.random(),
-              velocity: 0.5 * o.startVelocity + Math.random() * o.startVelocity,
-              angle2D: -r + (0.5 * l - Math.random() * l),
-              tiltAngle: Math.random() * Math.PI,
-              color: o.color,
-              shape: o.shape,
-              tick: 0,
-              totalTicks: o.ticks,
-              decay: o.decay,
-              drift: o.drift,
-              random: Math.random() + 5,
-              tiltSin: 0,
-              tiltCos: 0,
-              wobbleX: 0,
-              wobbleY: 0,
-              gravity: 3 * o.gravity,
-              ovalScalar: 0.6,
-              scalar: o.scalar
-            })
-          )
-        return a ? a.addFettis(S) : (a = T(t, S, u, n, i)).promise
-      }
-      function g(n) {
-        var o = c || p(n, 'disableForReducedMotion', Boolean),
-          g = p(n, 'zIndex', Number)
-        if (o && f)
-          return l(function (t) {
-            t()
-          })
-        i && a
-          ? (t = a.canvas)
-          : i &&
-            !t &&
-            ((t = (function (t) {
-              var e = document.createElement('canvas')
-              return (
-                (e.style.position = 'fixed'),
-                (e.style.top = '0px'),
-                (e.style.left = '0px'),
-                (e.style.pointerEvents = 'none'),
-                (e.style.zIndex = t),
-                e
-              )
-            })(g)),
-            document.body.appendChild(t)),
-          r && !d && u(t)
-        var m = {width: t.width, height: t.height}
-        function b() {
-          if (s) {
-            var e = {
-              getBoundingClientRect: function () {
-                if (!i) return t.getBoundingClientRect()
-              }
-            }
-            return (
-              u(e),
-              void s.postMessage({resize: {width: e.width, height: e.height}})
-            )
-          }
-          m.width = m.height = null
-        }
-        function v() {
-          ;(a = null),
-            r && e.removeEventListener('resize', b),
-            i && t && (document.body.removeChild(t), (t = null), (d = !1))
-        }
-        return (
-          s && !d && s.init(t),
-          (d = !0),
-          s && (t.__confetti_initialized = !0),
-          r && e.addEventListener('resize', b, !1),
-          s ? s.fire(n, m, v) : h(n, m, v)
-        )
-      }
-      return (
-        (g.reset = function () {
-          s && s.reset(), a && a.reset()
-        }),
-        g
-      )
-    }
-    ;(n.exports = E(null, {useWorker: !0, resize: !0})), (n.exports.create = E)
-  })(
-    (function () {
-      return void 0 !== t ? t : 'undefined' != typeof self ? self : this || {}
-    })(),
-    e,
-    !1
-  ),
-    (t.confetti = e.exports)
-})(window, {})

lnbits/static/js/service-worker.js

@@ -1,6 +1,6 @@
 // update cache version every time there is a new deployment
 // so the service worker reinitializes the cache
-const CACHE_VERSION = 117
+const CACHE_VERSION = 107
 const CURRENT_CACHE = `lnbits-${CACHE_VERSION}-`
 
 const getApiKey = request => {

lnbits/static/js/wallet.js

@@ -90,7 +90,6 @@ new Vue({
   mixins: [windowMixin],
   data: function () {
     return {
-      origin: window.location.origin,
       user: LNbits.map.user(window.user),
       receive: {
         show: false,
@@ -861,11 +860,11 @@ new Vue({
       this.disclaimerDialog.show = true
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
+
     // listen to incoming payments
     LNbits.events.onInvoicePaid(this.g.wallet, payment =>
       this.onPaymentReceived(payment.payment_hash)
     )
-    eventReactionWebocket(wallet.id)
   }
 })
 

lnbits/static/scss/base.scss

@@ -227,7 +227,3 @@ video {
   padding: 0.2rem;
   border-radius: 0.2rem;
 }
-
-.whitespace-pre-line {
-  white-space: pre-line;
-}

lnbits/static/vendor.json

@@ -37,7 +37,6 @@
     "js/components.js",
     "js/components/lnbits-funding-sources.js",
     "js/components/extension-settings.js",
-    "js/event-reactions.js",
     "js/bolt11-decoder.js"
   ],
   "css": ["vendor/quasar.css", "vendor/Chart.css", "css/base.css"]

lnbits/tasks.py

@@ -14,9 +14,11 @@ from pywebpush import WebPushException, webpush
 from lnbits.core.crud import (
     delete_expired_invoices,
     delete_webpush_subscriptions,
+    get_balance_checks,
     get_payments,
     get_standalone_payment,
 )
+from lnbits.core.services import redeem_lnurl_withdraw
 from lnbits.settings import settings
 from lnbits.wallets import get_wallet_class
 
@@ -58,25 +60,42 @@ async def send_push_promise(a, b) -> None:
     pass
 
 
-invoice_listeners: Dict[str, asyncio.Queue] = {}
+class SseListenersDict(dict):
+    """
+    A dict of sse listeners.
+    """
+
+    def __init__(self, name: Optional[str] = None):
+        self.name = name or f"sse_listener_{str(uuid.uuid4())[:8]}"
+
+    def __setitem__(self, key, value):
+        assert isinstance(key, str), f"{key} is not a string"
+        assert isinstance(value, asyncio.Queue), f"{value} is not an asyncio.Queue"
+        logger.trace(f"sse: adding listener {key} to {self.name}. len = {len(self)+1}")
+        return super().__setitem__(key, value)
+
+    def __delitem__(self, key):
+        logger.trace(f"sse: removing listener from {self.name}. len = {len(self)-1}")
+        return super().__delitem__(key)
+
+    _RaiseKeyError = object()  # singleton for no-default behavior
+
+    def pop(self, key, v=_RaiseKeyError) -> None:
+        logger.trace(f"sse: removing listener from {self.name}. len = {len(self)-1}")
+        return super().pop(key)
+
+
+invoice_listeners: Dict[str, asyncio.Queue] = SseListenersDict("invoice_listeners")
 
 
-# TODO: name should not be optional
-# some extensions still dont use a name, but they should
 def register_invoice_listener(send_chan: asyncio.Queue, name: Optional[str] = None):
     """
     A method intended for extensions (and core/tasks.py) to call when they want to be
     notified about new invoice payments incoming. Will emit all incoming payments.
     """
-    if not name:
-        # fallback to a random name if extension didn't provide one
-        name = f"no_name_{str(uuid.uuid4())[:8]}"
-
-    if invoice_listeners.get(name):
-        logger.warning(f"invoice listener `{name}` already exists, replacing it")
-
-    logger.trace(f"registering invoice listener `{name}`")
-    invoice_listeners[name] = send_chan
+    name_unique = f"{name or 'no_name'}_{str(uuid.uuid4())[:8]}"
+    logger.trace(f"sse: registering invoice listener {name_unique}")
+    invoice_listeners[name_unique] = send_chan
 
 
 async def webhook_handler():
@@ -167,6 +186,14 @@ async def check_pending_payments():
         await asyncio.sleep(60 * 30)  # every 30 minutes
 
 
+async def perform_balance_checks():
+    while True:
+        for bc in await get_balance_checks():
+            await redeem_lnurl_withdraw(bc.wallet, bc.url)
+
+        await asyncio.sleep(60 * 60 * 6)  # every 6 hours
+
+
 async def invoice_callback_dispatcher(checking_id: str):
     """
     Takes incoming payments, sets pending=False, and dispatches them to
@@ -174,12 +201,10 @@ async def invoice_callback_dispatcher(checking_id: str):
     """
     payment = await get_standalone_payment(checking_id, incoming=True)
     if payment and payment.is_in:
-        logger.trace(
-            f"invoice listeners: sending invoice callback for payment {checking_id}"
-        )
+        logger.trace(f"sse sending invoice callback for payment {checking_id}")
         await payment.set_pending(False)
-        for name, send_chan in invoice_listeners.items():
-            logger.trace(f"invoice listeners: sending to `{name}`")
+        for chan_name, send_chan in invoice_listeners.items():
+            logger.trace(f"sse sending to chan: {chan_name}")
             await send_chan.put(payment)
 
 

package.json

@@ -86,7 +86,6 @@
       "js/components.js",
       "js/components/lnbits-funding-sources.js",
       "js/components/extension-settings.js",
-      "js/event-reactions.js",
       "js/bolt11-decoder.js"
     ],
     "css": [

poetry.lock

@@ -2862,4 +2862,4 @@ liquid = ["wallycore"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10 | ^3.9"
-content-hash = "b2e21e0075047150888581a401d46fbe8efd6226e85a85189c3f3db51f825a48"
+content-hash = "c29cac992fae552eb8da791e13fe7766eab7571e260a42cc0de0d755508c42b7"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lnbits"
-version = "0.12.2"
+version = "0.12.0"
 description = "LNbits, free and open-source Lightning wallet and accounts system."
 authors = ["Alan Bits <alan@lnbits.com>"]
 

tests/helpers.py

@@ -36,7 +36,7 @@ is_regtest: bool = not is_fake
 docker_lightning_cli = [
     "docker",
     "exec",
-    "lnbits-lnd-1-1",
+    "lnbits-legend-lnd-1-1",
     "lncli",
     "--network",
     "regtest",
@@ -46,7 +46,7 @@ docker_lightning_cli = [
 docker_bitcoin_cli = [
     "docker",
     "exec",
-    "lnbits-bitcoind-1-1" "bitcoin-cli",
+    "lnbits-legend-bitcoind-1-1" "bitcoin-cli",
     "-rpcuser=lnbits",
     "-rpcpassword=lnbits",
     "-regtest",
@@ -56,7 +56,7 @@ docker_bitcoin_cli = [
 docker_lightning_unconnected_cli = [
     "docker",
     "exec",
-    "lnbits-lnd-2-1",
+    "lnbits-legend-lnd-2-1",
     "lncli",
     "--network",
     "regtest",

tools/i18n-ai-tool.py

@@ -64,7 +64,6 @@ def translate_string(lang_from, lang_to, text):
         "cs": "Czech",
         "sk": "Slovak",
         "kr": "Korean",
-        "fi": "Finnish",
     }[lang_to]
     assert os.getenv("OPENAI_API_KEY"), "OPENAI_API_KEY env var not set"
     client = OpenAI()