Merge pull request #3286 from Ishidres/fix/activityreminder-hotfix

activityreminder: fix new date format
pull/3297/head
Rob Pilling 2024-03-25 20:39:58 +00:00 committed by GitHub
commit 762cf6c002
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 9 deletions

View File

@ -29,16 +29,13 @@ exports.loadData = function () {
dismissDate: new Date(1970), dismissDate: new Date(1970),
pauseDate: new Date(1970), pauseDate: new Date(1970),
}, },
require("Storage").readJSON("activityreminder.data.json") || {});
require("Storage").readJSON("activityreminder.data.json") || {});
if (typeof (data.stepsDate) == "string") data.stepsDate = new Date(typeof data.stepsDate === 'string' ? data.stepsDate : data.stepsDate.ms);
data.stepsDate = new Date(data.stepsDate); data.okDate = new Date(typeof data.okDate === 'string' ? data.okDate : data.okDate.ms);
if (typeof (data.okDate) == "string") data.dismissDate = new Date(typeof data.dismissDate === 'string' ? data.dismissDate : data.dismissDate.ms);
data.okDate = new Date(data.okDate); data.pauseDate = new Date(typeof data.pauseDate === 'string' ? data.pauseDate : data.pauseDate.ms);
if (typeof (data.dismissDate) == "string")
data.dismissDate = new Date(data.dismissDate);
if (typeof (data.pauseDate) == "string")
data.pauseDate = new Date(data.pauseDate);
return data; return data;
}; };