mirrors/lnbits-legend
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits-legend.git synced 2025-02-23 14:40:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: merge errors

Browse source
This commit is contained in:
Vlad Stan 2023-01-25 09:56:05 +02:00
parent 9cca87f738
commit dd3fc7c2bb
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lnbits/core/crud.py
View file

@ -732,7 +732,9 @@ async def update_migration_version(conn, db_name, version):
ON CONFLICT (db) DO UPDATE SET version = ?
""",
(db_name, version, version),
=======
)
# tinyurl
# -------

4
lnbits/core/migrations.py
View file

@ -270,6 +270,7 @@ async def m008_create_admin_settings_table(db):
"""
)
async def m009_create_tinyurl_table(db):
await db.execute(
f"""
@ -282,7 +283,8 @@ async def m009_create_tinyurl_table(db):
);
"""
)
async def m010_create_installed_extensions_table(db):
await db.execute(
"""

1
lnbits/core/models.py
View file

@ -217,6 +217,7 @@ class BalanceCheck(BaseModel):
class CoreAppExtra:
register_new_ext_routes: Callable
class TinyURL(BaseModel):
id: str
url: str

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

@ -56,10 +56,10 @@ from lnbits.utils.exchange_rates import (
from .. import core_app, core_app_extra, db
from ..crud import (
add_installed_extension,
delete_installed_extension,
get_dbversions,
create_tinyurl,
delete_installed_extension,
delete_tinyurl,
get_dbversions,
get_payments,
get_standalone_payment,
get_tinyurl,
@ -818,6 +818,8 @@ async def get_extension_releases(ext_id: str, user: User = Depends(check_admin))
except Exception as ex:
raise HTTPException(
status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
)
############################TINYURL##################################