From b212641069d18dbf6515c2e313de9e7e322ef37d Mon Sep 17 00:00:00 2001
From: rejas <github@veeck.de>
Date: Sat, 24 Apr 2021 09:14:08 +0200
Subject: [PATCH] Move checkFetchStatus into NodelHelper

---
 js/fetcher_helper.js                        | 12 ------------
 js/node_helper.js                           |  9 +++++++++
 modules/default/calendar/calendarfetcher.js |  4 ++--
 modules/default/newsfeed/newsfeedfetcher.js |  4 ++--
 package.json                                |  1 -
 5 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100644 js/fetcher_helper.js

diff --git a/js/fetcher_helper.js b/js/fetcher_helper.js
deleted file mode 100644
index 04532873..00000000
--- a/js/fetcher_helper.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const FetcherHelper = {
-	checkStatus: function (response) {
-		// response.status >= 200 && response.status < 300
-		if (response.ok) {
-			return response;
-		} else {
-			throw Error(response.statusText);
-		}
-	}
-};
-
-module.exports = FetcherHelper;
diff --git a/js/node_helper.js b/js/node_helper.js
index 81d2d9d5..415ae658 100644
--- a/js/node_helper.js
+++ b/js/node_helper.js
@@ -113,6 +113,15 @@ const NodeHelper = Class.extend({
 	}
 });
 
+NodeHelper.checkFetchStatus = function (response) {
+	// response.status >= 200 && response.status < 300
+	if (response.ok) {
+		return response;
+	} else {
+		throw Error(response.statusText);
+	}
+};
+
 NodeHelper.create = function (moduleDefinition) {
 	return NodeHelper.extend(moduleDefinition);
 };
diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js
index b5d98607..02778fd5 100644
--- a/modules/default/calendar/calendarfetcher.js
+++ b/modules/default/calendar/calendarfetcher.js
@@ -5,8 +5,8 @@
  * MIT Licensed.
  */
 const CalendarUtils = require("./calendarutils");
-const FetcherHelper = require("fetcher_helper");
 const Log = require("logger");
+const NodeHelper = require("node_helper");
 const ical = require("node-ical");
 const fetch = require("node-fetch");
 const digest = require("digest-fetch");
@@ -63,7 +63,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
 		}
 
 		fetcher
-			.then(FetcherHelper.checkStatus)
+			.then(NodeHelper.checkFetchStatus)
 			.then((response) => response.text())
 			.then((responseData) => {
 				let data = [];
diff --git a/modules/default/newsfeed/newsfeedfetcher.js b/modules/default/newsfeed/newsfeedfetcher.js
index 4d359b99..bbfda9e1 100644
--- a/modules/default/newsfeed/newsfeedfetcher.js
+++ b/modules/default/newsfeed/newsfeedfetcher.js
@@ -5,8 +5,8 @@
  * MIT Licensed.
  */
 const Log = require("logger");
-const FetcherHelper = require("fetcher_helper");
 const FeedMe = require("feedme");
+const NodeHelper = require("node_helper");
 const fetch = require("node-fetch");
 const iconv = require("iconv-lite");
 
@@ -85,7 +85,7 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
 		};
 
 		fetch(url, { headers: headers })
-			.then(FetcherHelper.checkStatus)
+			.then(NodeHelper.checkFetchStatus)
 			.then((response) => {
 				response.body.pipe(iconv.decodeStream(encoding)).pipe(parser);
 			})
diff --git a/package.json b/package.json
index 39c47bd6..4b45193d 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,6 @@
 		"socket.io": "^4.1.2"
 	},
 	"_moduleAliases": {
-		"fetcher_helper": "js/fetcher_helper.js",
 		"node_helper": "js/node_helper.js",
 		"logger": "js/logger.js"
 	},