@sebbo2002/vestaboard2mqtt 1.0.0-develop.3 → 1.0.0-develop.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/dist/lib/pages/calendar.js +10 -3
- package/dist/lib/pages/calendar.js.map +1 -1
- package/package.json +2 -2
package/LICENSE
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
MIT License
|
|
2
2
|
|
|
3
|
-
Copyright (c)
|
|
3
|
+
Copyright (c) 2022 Sebastian Pekarek
|
|
4
4
|
|
|
5
5
|
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
|
|
6
6
|
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
|
|
@@ -90,11 +90,10 @@ class CalendarPage {
|
|
|
90
90
|
fetchURLs(urls) {
|
|
91
91
|
return __awaiter(this, void 0, void 0, function* () {
|
|
92
92
|
const rawResult = yield Promise.all(urls.map(url => this.fetchURL(url)));
|
|
93
|
-
|
|
93
|
+
return []
|
|
94
94
|
.concat(...rawResult)
|
|
95
95
|
.filter(entry => entry.end > new Date())
|
|
96
96
|
.sort((a, b) => a.end.getTime() - b.end.getTime());
|
|
97
|
-
return mergedResult;
|
|
98
97
|
});
|
|
99
98
|
}
|
|
100
99
|
static getTimeStr(event) {
|
|
@@ -118,7 +117,15 @@ class CalendarPage {
|
|
|
118
117
|
.map(id => config_1.default.calendar.urls[id])
|
|
119
118
|
.filter(Boolean);
|
|
120
119
|
const calendar = yield this.fetchURLs(urls)
|
|
121
|
-
.then(calendar => calendar.filter(entry =>
|
|
120
|
+
.then(calendar => calendar.filter(entry => {
|
|
121
|
+
if (CalendarPage.isMidnight(entry.start) && CalendarPage.isMidnight(entry.end)) {
|
|
122
|
+
return CalendarPage.isSameDay(new Date(), entry.start) ||
|
|
123
|
+
CalendarPage.isSameDay(new Date(), entry.end);
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
return entry.start < new Date(new Date().getTime() + (1000 * 60 * 60 * 12));
|
|
127
|
+
}
|
|
128
|
+
}));
|
|
122
129
|
if (!calendar.length) {
|
|
123
130
|
const today = new today_1.default();
|
|
124
131
|
const pageConfigCache = new cache_1.default('page-config');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calendar.js","sourceRoot":"","sources":["../../../src/lib/pages/calendar.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"calendar.js","sourceRoot":"","sources":["../../../src/lib/pages/calendar.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"author": "Sebastian Pekarek <
|
|
2
|
+
"author": "Sebastian Pekarek <mail@sebbo.net>",
|
|
3
3
|
"bin": {
|
|
4
4
|
"vestaboard2mqtt": "./dist/bin/start.js"
|
|
5
5
|
},
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"start": "node ./dist/bin/start.js",
|
|
61
61
|
"test": "mocha"
|
|
62
62
|
},
|
|
63
|
-
"version": "1.0.0-develop.
|
|
63
|
+
"version": "1.0.0-develop.4"
|
|
64
64
|
}
|