From 9b86049964bd05a7aec8ac9ae89f6582df9cd6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Thu, 8 Dec 2016 01:29:55 -0300 Subject: [PATCH] newsfeed, calendar: Standardize user-agent. Add node and MagicMirror version. --- modules/default/calendar/calendarfetcher.js | 3 ++- modules/default/newsfeed/fetcher.js | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index 0881afb3..cb989edf 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -25,9 +25,10 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe clearTimeout(reloadTimer); reloadTimer = null; + nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]); var opts = { headers: { - "User-Agent": "Mozilla/5.0 (Node.js 6.0.0) MagicMirror/v2 (https://github.com/MichMich/MagicMirror/)" + "User-Agent": "Mozilla/5.0 (Node.js "+ nodeVersion + ") MagicMirror/" + global.version + " (https://github.com/MichMich/MagicMirror/)" } }; diff --git a/modules/default/newsfeed/fetcher.js b/modules/default/newsfeed/fetcher.js index 8d920eec..3b45a3b5 100644 --- a/modules/default/newsfeed/fetcher.js +++ b/modules/default/newsfeed/fetcher.js @@ -81,7 +81,9 @@ var Fetcher = function(url, reloadInterval, encoding) { scheduleTimer(); }); - var headers = {'User-Agent':'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A'}; + nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]); + headers = {"User-Agent": "Mozilla/5.0 (Node.js "+ nodeVersion + ") MagicMirror/" + global.version + " (https://github.com/MichMich/MagicMirror/)"} + request({uri: url, encoding: null, headers: headers}).pipe(iconv.decodeStream(encoding)).pipe(parser); };