From 64bb2350111b9aa5bf8e4a27358332a3c367cb40 Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Sat, 12 Dec 2020 17:23:29 +0100
Subject: [PATCH] Fixed daily execution of tasks for different timezones

---
 maloja/__pkginfo__.py                  | 2 +-
 maloja/data_files/settings/default.ini | 6 ++----
 maloja/globalconf.py                   | 7 ++++---
 maloja/malojatime.py                   | 8 ++------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py
index 2e9b709..9f8b37a 100644
--- a/maloja/__pkginfo__.py
+++ b/maloja/__pkginfo__.py
@@ -15,7 +15,7 @@ links = {
 requires = [
 	"bottle>=0.12.16",
 	"waitress>=1.3",
-	"doreah>=1.6.10",
+	"doreah>=1.6.13",
 	"nimrodel>=0.6.4",
 	"setproctitle>=1.1.10",
 	"wand>=0.5.4",
diff --git a/maloja/data_files/settings/default.ini b/maloja/data_files/settings/default.ini
index 5c72b93..b929df3 100644
--- a/maloja/data_files/settings/default.ini
+++ b/maloja/data_files/settings/default.ini
@@ -71,10 +71,8 @@ CHARTS_DISPLAY_TILES = false
 # prevent visitors from mindlessly clicking on those options and hogging your cpu
 DISCOURAGE_CPU_HEAVY_STATS = false
 
-# Use system timezone by default. Otherwise specify as either:
-# offset in hours IE 0 = UTC, -5 = EST
-# IANA time zone IE America/New_York = EST
-TIMEZONE = None
+# Offset in hours to UTC
+TIMEZONE = 0
 
 [Fluff]
 
diff --git a/maloja/globalconf.py b/maloja/globalconf.py
index 4404677..61adb2c 100644
--- a/maloja/globalconf.py
+++ b/maloja/globalconf.py
@@ -57,9 +57,6 @@ config(
 	caching={
 		"folder": datadir("cache")
 	},
-	regular={
-		"autostart": False
-	},
 	auth={
 		"multiuser":False,
 		"cookieprefix":"maloja",
@@ -74,6 +71,10 @@ settingsconfig._readpreconfig()
 config(
 	logging={
 		"logfolder": datadir("logs") if get_settings("LOGGING") else None
+	},
+	regular={
+		"autostart": False,
+		"offset": get_settings("TIMEZONE")
 	}
 )
 
diff --git a/maloja/malojatime.py b/maloja/malojatime.py
index 6853afd..59b023c 100644
--- a/maloja/malojatime.py
+++ b/maloja/malojatime.py
@@ -6,13 +6,9 @@ from os.path import commonprefix
 import math
 from doreah.settings import get_settings
 
-# use system timezone as default
-# https://stackoverflow.com/a/39079819/1469797
-TIMEZONE = datetime.datetime.now(datetime.timezone.utc).astimezone().tzinfo
-# if user specifies a timezone in settings then try to use that instead
+
 OFFSET = get_settings("TIMEZONE")
-if OFFSET is not None:
-	TIMEZONE = timezone(timedelta(hours=OFFSET))
+TIMEZONE = timezone(timedelta(hours=OFFSET))
 
 FIRST_SCROBBLE = int(datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc).timestamp())