aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: merge issues

Browse source
This commit is contained in:
Vlad Stan 2022-12-22 17:03:26 +02:00
parent 9dfeef15fd
commit 8c1479427d
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lnbits/core/views/api.py
View file

@ -832,10 +832,10 @@ async def api_install_extension(
clean_upgraded_exts = list( clean_upgraded_exts = list(
filter( filter(
lambda old_ext: old_ext.endswith(ext_temp_path), 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 # mount routes at the very end
core_app_extra.register_new_ext_routes(ext) core_app_extra.register_new_ext_routes(ext)

5
lnbits/helpers.py
View file

@ -26,6 +26,7 @@ class Extension(NamedTuple):
migration_module: Optional[str] = None migration_module: Optional[str] = None
db_name: Optional[str] = None db_name: Optional[str] = None
version: Optional[str] = "" version: Optional[str] = ""
hash: Optional[str] = ""
class InstallableExtension(NamedTuple): class InstallableExtension(NamedTuple):
id: str id: str
@ -104,7 +105,7 @@ class InstalledExtensionMiddleware:
path_type = None path_type = None
# block path for all users if the extension is disabled # 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( response = JSONResponse(
status_code=HTTPStatus.NOT_FOUND, status_code=HTTPStatus.NOT_FOUND,
content={"detail": f"Extension '{path_name}' disabled"}, content={"detail": f"Extension '{path_name}' disabled"},
@ -117,7 +118,7 @@ class InstalledExtensionMiddleware:
upgraded_extensions = list( upgraded_extensions = list(
filter( filter(
lambda ext: ext.endswith(f"/{path_name}"), lambda ext: ext.endswith(f"/{path_name}"),
g().config.LNBITS_UPGRADED_EXTENSIONS, settings.lnbits_upgraded_extensions,
) )
) )
if len(upgraded_extensions) != 0: if len(upgraded_extensions) != 0:

2
lnbits/settings.py
View file

@ -41,7 +41,7 @@ class UsersSettings(LNbitsSettings):
lnbits_admin_extensions: List[str] = Field(default=[]) lnbits_admin_extensions: List[str] = Field(default=[])
lnbits_disabled_extensions: List[str] = Field(default=[]) lnbits_disabled_extensions: List[str] = Field(default=[])
lnbits_extensions_manifests: 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): class ThemesSettings(LNbitsSettings):
lnbits_site_title: str = Field(default="LNbits") lnbits_site_title: str = Field(default="LNbits")