diff --git a/lnbits/core/models/extensions.py b/lnbits/core/models/extensions.py index ad7f6a323..abd771cd6 100644 --- a/lnbits/core/models/extensions.py +++ b/lnbits/core/models/extensions.py @@ -104,7 +104,7 @@ class ReleasePaymentInfo(BaseModel): class PayToEnableInfo(BaseModel): - amount: int + amount: int = 0 required: bool = False wallet: Optional[str] = None diff --git a/lnbits/core/services/payments.py b/lnbits/core/services/payments.py index ff38ec3f9..069298fe3 100644 --- a/lnbits/core/services/payments.py +++ b/lnbits/core/services/payments.py @@ -1,6 +1,6 @@ import json import time -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone from typing import Optional from bolt11 import Bolt11, MilliSatoshi, Tags @@ -439,7 +439,7 @@ async def get_payments_daily_stats( data_in, data_out = await get_daily_stats(filters) balance_total: float = 0 - _none = PaymentDailyStats(date=datetime.now()) + _none = PaymentDailyStats(date=datetime.now(timezone.utc)) if len(data_in) == 0: data_in = [_none] if len(data_out) == 0: diff --git a/lnbits/db.py b/lnbits/db.py index 60ca60d3f..eafda4646 100644 --- a/lnbits/db.py +++ b/lnbits/db.py @@ -86,7 +86,12 @@ class Compat: if self.type in {POSTGRES, COCKROACH}: return f"date_trunc('{group}', time)" elif self.type == SQLITE: - return f"unixepoch(strftime('{sqlite_formats[group]}', time, 'unixepoch'))" + return ( + "CAST (strftime('%s',datetime(strftime(" + f"'{sqlite_formats[group]}'" + ", time, 'unixepoch'))) AS INT)" + ) + return "" @property