From 8c1479427d3381c2efa5475e52b3b221b8fe6210 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 22 Dec 2022 17:03:26 +0200
Subject: [PATCH] fix: merge issues

---
 lnbits/core/views/api.py | 4 ++--
 lnbits/helpers.py        | 5 +++--
 lnbits/settings.py       | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index d04d07c0..373c7bd5 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -832,10 +832,10 @@ async def api_install_extension(
             clean_upgraded_exts = list(
                 filter(
                     lambda old_ext: old_ext.endswith(ext_temp_path),
-                    settings.LNBITS_UPGRADED_EXTENSIONS,
+                    settings.lnbits_upgraded_extensions,
                 )
             )
-            settings.LNBITS_UPGRADED_EXTENSIONS = clean_upgraded_exts + [ext_temp_path]
+            settings.lnbits_upgraded_extensions = clean_upgraded_exts + [ext_temp_path]
 
         # mount routes at the very end
         core_app_extra.register_new_ext_routes(ext)
diff --git a/lnbits/helpers.py b/lnbits/helpers.py
index 26eb6bd8..6810d383 100644
--- a/lnbits/helpers.py
+++ b/lnbits/helpers.py
@@ -26,6 +26,7 @@ class Extension(NamedTuple):
     migration_module: Optional[str] = None
     db_name: Optional[str] = None
     version: Optional[str] = ""
+    hash: Optional[str] = ""
 
 class InstallableExtension(NamedTuple):
     id: str
@@ -104,7 +105,7 @@ class InstalledExtensionMiddleware:
             path_type = None
 
         # block path for all users if the extension is disabled
-        if path_name in settings.LNBITS_DISABLED_EXTENSIONS:
+        if path_name in settings.lnbits_disabled_extensions:
             response = JSONResponse(
                 status_code=HTTPStatus.NOT_FOUND,
                 content={"detail": f"Extension '{path_name}' disabled"},
@@ -117,7 +118,7 @@ class InstalledExtensionMiddleware:
             upgraded_extensions = list(
                 filter(
                     lambda ext: ext.endswith(f"/{path_name}"),
-                    g().config.LNBITS_UPGRADED_EXTENSIONS,
+                    settings.lnbits_upgraded_extensions,
                 )
             )
             if len(upgraded_extensions) != 0:
diff --git a/lnbits/settings.py b/lnbits/settings.py
index 44113d32..80680d5f 100644
--- a/lnbits/settings.py
+++ b/lnbits/settings.py
@@ -41,7 +41,7 @@ class UsersSettings(LNbitsSettings):
     lnbits_admin_extensions: List[str] = Field(default=[])
     lnbits_disabled_extensions: List[str] = Field(default=[])
     lnbits_extensions_manifests: List[str] = Field(default=[])
-    # LNBITS_UPGRADED_EXTENSIONS: List[str] = [] # todo: 
+    lnbits_upgraded_extensions: List[str] = Field(default=[])
 
 class ThemesSettings(LNbitsSettings):
     lnbits_site_title: str = Field(default="LNbits")