Merge pull request #6 from DoktorShift/Add-Timezone

Add timezone

Author: DoktorShift

crud.py

@@ -12,6 +12,8 @@
 from loguru import logger
 
 from datetime import datetime
+from zoneinfo import ZoneInfo
+
 from time import time
 
 import re
@@ -32,7 +34,7 @@ async def create_device(data: CreateLnurldevice, req: Request) -> Lnurldevice:
             )
 
     await db.execute(
-        "INSERT INTO devicetimer.device (id, key, title, wallet, currency, available_start, available_stop, timeout, closed_url, wait_url, maxperday, switches) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+        "INSERT INTO devicetimer.device (id, key, title, wallet, currency, available_start, available_stop, timeout, timezone, closed_url, wait_url, maxperday, switches) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
         (
             device_id,
             device_key,
@@ -42,6 +44,7 @@ async def create_device(data: CreateLnurldevice, req: Request) -> Lnurldevice:
             data.available_start,
             data.available_stop,
             data.timeout,
+            data.timezone,
             data.closed_url,
             data.wait_url,
             data.maxperday,
@@ -80,6 +83,7 @@ async def update_device(
             available_start = ?,
             available_stop = ?,
             timeout = ?,
+            timezone = ?,
             closed_url = ?,
             maxperday = ?,    
             wait_url = ?,
@@ -93,6 +97,7 @@ async def update_device(
             data.available_start,
             data.available_stop,
             data.timeout,
+            data.timezone,
             data.closed_url,
             data.maxperday,
             data.wait_url,
@@ -240,7 +245,7 @@ async def get_payment_allowed(
         device: Lnurldevice, switch: LnurldeviceSwitch
     ) -> PaymentAllowed:
 
-    now = datetime.now()
+    now = datetime.now(ZoneInfo(device.timezone))
     minutes = now.hour * 60 + now.minute
 
     start_minutes = get_minutes(device.available_start)

migrations.py

@@ -58,3 +58,15 @@ async def m004_redux(db):
         ALTER TABLE devicetimer.device ADD COLUMN maxperday INT DEFAULT 0
         """
     )
+
+async def m005_redux(db):
+    await db.execute(
+        f"""
+        ALTER TABLE devicetimer.device ADD COLUMN timezone TEXT DEFAULT 'europe/amsterdam';
+       """
+    )
+    await db.execute(
+        f"""
+        UPDATE devicetimer.device SET timezone='europe/amsterdam'
+        """
+    )

models.py

@@ -26,6 +26,7 @@ class CreateLnurldevice(BaseModel):
     available_start: str
     available_stop: str
     timeout: int
+    timezone: str
     maxperday: Optional[int]
     closed_url: Optional[str]
     wait_url: Optional[str]
@@ -43,6 +44,7 @@ class Lnurldevice(BaseModel):
     available_start: str
     available_stop: str
     timeout: int
+    timezone: str
     maxperday: Optional[int]
     closed_url: Optional[str]
     wait_url: Optional[str]

tasks.py

@@ -1,12 +1,23 @@
 import asyncio
 
 from lnbits.core.models import Payment
-from lnbits.core.services import websocketUpdater
+
 from lnbits.helpers import get_current_extension_name
 from lnbits.tasks import register_invoice_listener
 
 from .crud import get_payment, update_payment, get_device
 
+from lnbits.extension_manager import version_parse
+from lnbits.settings import settings
+
+# from LNbits release 0.12.6 the websocketUpdater function was renamed to websocket_updater
+print(settings.version)
+print(version_parse(settings.version))
+if version_parse(settings.version) >= version_parse("0.12.6"):
+    from lnbits.core.services import websocket_updater
+else:
+    from lnbits.core.services import websocketUpdater as websocket_updater
+
 async def wait_for_paid_invoices():
     invoice_queue = asyncio.Queue()
     register_invoice_listener(invoice_queue, get_current_extension_name())
@@ -45,7 +56,7 @@ async def on_invoice_paid(payment: Payment) -> None:
     if not switch:
         return
 
-    return await websocketUpdater(
+    return await websocket_updater(
         device_payment.deviceid,
         f"{switch.gpio_pin}-{switch.gpio_duration}"
     )

templates/devicetimer/index.html

@@ -233,6 +233,16 @@ <h6 class="text-subtitle1 q-my-none">
           :options="currency"
         ></q-select>
 
+	<q-select
+          filled
+          dense
+          v-model.trim="formDialoglnurldevice.data.timezone"
+          type="text"
+          label="Timezone for the device"
+          :options="timezone"
+        ></q-select>
+
+
         <q-input
         filled
         dense
@@ -442,6 +452,7 @@ <h6 class="text-subtitle1 q-my-none">
         wslocation: window.location.hostname,
         filter: '',
         currency: 'USD',
+	timezone: 'Europe/Amsterdam',
         lnurlValue: '',
         qrcode_url: '',
         websocketMessage: '',
@@ -743,6 +754,15 @@ <h6 class="text-subtitle1 q-my-none">
         .catch(err => {
           LNbits.utils.notifyApiError(err)
         })
+	LNbits.api
+        .request('GET', '/devicetimer/api/v1/timezones')
+        .then(response => {
+          this.timezone = ['Europe/Amsterdam', ...response.data]
+        })
+        .catch(err => {
+          LNbits.utils.notifyApiError(err)
+        })
+	    
     }
   })
 </script>

views_api.py

@@ -3,6 +3,7 @@
 from fastapi import Depends, HTTPException, Query, Request
 from loguru import logger
 import re
+import zoneinfo
 
 from lnbits.core.crud import get_user, update_payment_extra
 from lnbits.decorators import (
@@ -30,6 +31,9 @@
 async def api_list_currencies_available():
     return list(currencies.keys())
 
+@devicetimer_ext.get("/api/v1/timezones")
+async def api_list_timezones_available():
+    return sorted(zoneinfo.available_timezones(),key=str.lower)
 
 @devicetimer_ext.post("/api/v1/device", dependencies=[Depends(require_admin_key)])
 async def api_lnurldevice_create(data: CreateLnurldevice, req: Request):
@@ -38,6 +42,11 @@ async def api_lnurldevice_create(data: CreateLnurldevice, req: Request):
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST, detail="Opening time format must be hh:mm"
         )
+
+    if data.timezone not in  zoneinfo.available_timezones():
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST, detail="Illegal timezone"
+        )
 
     result = re.search("^\d{2}\:\d{2}$",data.available_stop)
     if not result:
@@ -64,6 +73,11 @@ async def api_lnurldevice_update(
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST, detail="Opening time format must be hh:mm"
         )
+
+    if data.timezone not in  zoneinfo.available_timezones():
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST, detail="Illegal timezone"
+        )
 
     result = re.search("^\d{2}\:\d{2}$",data.available_stop)
     if not result: