From e3c102aa5b7efc51976bb3152bf3581fa6fe9eda Mon Sep 17 00:00:00 2001
From: benji7425 <benji7425@outlook.com>
Date: Mon, 2 Oct 2017 02:08:04 +0100
Subject: [PATCH] 3.0.0-b6

Remove 'BODY is not RSS or ATOM' error from console logging'
---
 CHANGELOG.md            | 7 +++++++
 app/models/feed-data.js | 8 ++++++--
 package.json            | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccc68b3..8d573bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v3.0.0-b6
+
+### Updatd
+
+- Removed "Body is not RSS or ATOM" error from being console logged
+	- These seem to happen quite a lot, but don't actually impair the functionality, so just cause un-necessary spam
+
 ## v3.0.0-b5
 
 ### Added
diff --git a/app/models/feed-data.js b/app/models/feed-data.js
index d0d44c1..ae78fc5 100644
--- a/app/models/feed-data.js
+++ b/app/models/feed-data.js
@@ -70,8 +70,12 @@ module.exports = class FeedData {
 
 	_doFetchRSS(guild) {
 		FeedRead(this.url, (err, articles) => {
-			if (err)
-				return DiscordUtil.dateError(err.message || err);
+			//filter out "Body is not RSS or ATOM" errors because these seem to happen rather frequently
+			if (err) {
+				if (err.message !== "Body is not RSS or ATOM")
+					DiscordUtil.dateError("Error reading RSS feed: " + (err.message || err));
+				return;
+			}
 
 			const latest = normaliseUrl(articles[0].link);
 
diff --git a/package.json b/package.json
index 147addf..4862015 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.0.0-b5",
+  "version": "3.0.0-b6",
   "main": "app/index.js",
   "scripts": {
 	"postinstall": "cd ./discord-bot-core && npm install",