kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2730 from khassel/newsfeed-user-agent

Browse Source
This commit is contained in:
Michael Teeuw 2021-12-14 05:59:57 +01:00 committed by GitHub
commit eae277f165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 882 additions and 900 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@ _This release is scheduled to be released on 2022-01-01._
- Fixed incorrect time zone correction of recurring full day events (#2632 and #2634). - Fixed incorrect time zone correction of recurring full day events (#2632 and #2634).
- Fixed e2e tests by increasing testTimeout. - Fixed e2e tests by increasing testTimeout.
- Revert node-ical update due to missing luxon package. - Revert node-ical update due to missing luxon package.
- Fixed User-Agent-Header for newsfeed and calendar module (#2729).
## [2.17.1] - 2021-10-01 ## [2.17.1] - 2021-10-01

2
modules/default/calendar/calendarfetcher.js
View File

@ -41,7 +41,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
let fetcher = null; let fetcher = null;
let httpsAgent = null; let httpsAgent = null;
let headers = { let headers = {
"User-Agent": "Mozilla/5.0 (Node.js " + nodeVersion + ") MagicMirror/" + global.version + " (https://github.com/MichMich/MagicMirror/)" "User-Agent": "Mozilla/5.0 (Node.js " + nodeVersion + ") MagicMirror/" + global.version
}; };
if (selfSignedCert) { if (selfSignedCert) {

2
modules/default/newsfeed/newsfeedfetcher.js
View File

@ -79,7 +79,7 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]); const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
const headers = { const headers = {
"User-Agent": "Mozilla/5.0 (Node.js " + nodeVersion + ") MagicMirror/" + global.version + " (https://github.com/MichMich/MagicMirror/)", "User-Agent": "Mozilla/5.0 (Node.js " + nodeVersion + ") MagicMirror/" + global.version,
"Cache-Control": "max-age=0, no-cache, no-store, must-revalidate", "Cache-Control": "max-age=0, no-cache, no-store, must-revalidate",
Pragma: "no-cache" Pragma: "no-cache"
}; };

1761
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@ -48,16 +48,16 @@
"devDependencies": { "devDependencies": {
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-jest": "^25.3.0", "eslint-plugin-jest": "^25.3.0",
"eslint-plugin-jsdoc": "^37.0.3", "eslint-plugin-jsdoc": "^37.2.0",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^4.0.0",
"express-basic-auth": "^1.2.0", "express-basic-auth": "^1.2.1",
"husky": "^7.0.4", "husky": "^7.0.4",
"jest": "^27.3.1", "jest": "^27.4.5",
"jsdom": "^18.1.1", "jsdom": "^19.0.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"nyc": "^15.1.0", "nyc": "^15.1.0",
"playwright": "^1.16.3", "playwright": "^1.17.1",
"prettier": "^2.5.0", "prettier": "^2.5.1",
"pretty-quick": "^3.1.2", "pretty-quick": "^3.1.2",
"sinon": "^12.0.1", "sinon": "^12.0.1",
"stylelint": "^14.1.0", "stylelint": "^14.1.0",
@ -67,13 +67,13 @@
"suncalc": "^1.8.0" "suncalc": "^1.8.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"electron": "^16.0.2" "electron": "^16.0.4"
}, },
"dependencies": { "dependencies": {
"colors": "^1.4.0", "colors": "^1.4.0",
"console-stamp": "^3.0.3", "console-stamp": "^3.0.3",
"digest-fetch": "^1.2.1", "digest-fetch": "^1.2.1",
"eslint": "^8.3.0", "eslint": "^8.4.1",
"express": "^4.17.1", "express": "^4.17.1",
"express-ipfilter": "^1.2.0", "express-ipfilter": "^1.2.0",
"feedme": "^2.0.2", "feedme": "^2.0.2",