From a4d5b74b57d21d45bfe60b83f75a2664df4df547 Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Sun, 3 Apr 2016 23:16:58 +0200
Subject: [PATCH] Fixes encoding issues: #125 & #126

---
 modules/default/calendar/node_helper.js | 4 ++--
 modules/default/newsfeed/newsfetcher.js | 4 ++--
 package.json                            | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/default/calendar/node_helper.js b/modules/default/calendar/node_helper.js
index 678a6498..7b6e3188 100644
--- a/modules/default/calendar/node_helper.js
+++ b/modules/default/calendar/node_helper.js
@@ -70,7 +70,7 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
 						for (var d in dates) {
 							startDate = moment(new Date(dates[d]));
 							newEvents.push({
-								title: event.summary,
+								title: (typeof event.summary.val !== 'undefined') ? event.summary.val : event.summary,
 								startDate: startDate.format('x')
 							});
 						}
@@ -80,7 +80,7 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
 						
 						if (startDate > today && startDate <= today.add(maximumNumberOfDays, 'days')) {
 							newEvents.push({
-								title: event.summary,
+								title: (typeof event.summary.val !== 'undefined') ? event.summary.val : event.summary,
 								startDate: startDate.format('x')
 							});
 						}
diff --git a/modules/default/newsfeed/newsfetcher.js b/modules/default/newsfeed/newsfetcher.js
index ed33f585..3075ac67 100644
--- a/modules/default/newsfeed/newsfetcher.js
+++ b/modules/default/newsfeed/newsfetcher.js
@@ -7,6 +7,7 @@
 
 var FeedMe = require('feedme');
 var request = require('request');
+var iconv = require('iconv-lite');
 
 var NewsFetcher = function() {
 	var self = this;
@@ -19,7 +20,6 @@ var NewsFetcher = function() {
 	var parser = new FeedMe();
 
 	parser.on('item', function(item) {
-		//console.log(item);
 		self.items.push({
 			title: item.title,
 			pubdate: item.pubdate,
@@ -46,7 +46,7 @@ var NewsFetcher = function() {
 	self.fetchNews = function(url, success, error) {
 		self.successCallback = success;
 		self.errorCallback = error;
-		request(url).pipe(parser);
+		request({uri:url, encoding:null}).pipe(iconv.decodeStream('ISO-8859-1')).pipe(parser);
 	};
 };
 
diff --git a/package.json b/package.json
index 96070afe..f116543b 100755
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
 		"feedme": "latest",
 		"valid-url": "latest",
 		"ical": "latest",
-		"moment": "latest"
+		"moment": "latest",
+		"iconv-lite": "latest"
 	}
 }