From 68680d624f2b7f431ad3d0140278e47ba7b5b97c Mon Sep 17 00:00:00 2001
From: benji7425 <benji7425@outlook.com>
Date: Tue, 14 Nov 2017 22:27:58 +0000
Subject: [PATCH] Quickfix deleted channels with feeds causing reconnect loop

---
 .gitignore               |  2 +-
 CHANGELOG.md             |  6 ++++++
 app/models/guild-data.js | 17 ++++++++++-------
 package.json             |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1f8cebc..b301fcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 update.sh
 guilds.json
-token.json
+token.json*
 log
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb39967..a69c34f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v3.1.2
+
+### Fixed
+
+- Deleted channels with feeds sending the bot into a reconnect loop
+
 ## v3.1.1
 
 ### Fixed
diff --git a/app/models/guild-data.js b/app/models/guild-data.js
index e6e5b68..e49cc28 100644
--- a/app/models/guild-data.js
+++ b/app/models/guild-data.js
@@ -11,17 +11,20 @@ module.exports = class GuildData extends Core.BaseGuildData {
 	cachePastPostedLinks(guild) {
 		const promises = [];
 
-		this.feeds.forEach(feed =>
-			promises.push(
-				feed.updatePastPostedLinks(guild)
-					.catch(err => DiscordUtil.dateError(`Error reading history in ${err.path}`))
-			)
-		);
+		this.feeds.forEach(feed => {
+			if (guild.channels.get(feed.channelID))
+				promises.push(
+					feed.updatePastPostedLinks(guild)
+						.catch(err => DiscordUtil.dateError(`Error reading history in channel ${feed.channelID}: ${err.message || err}`)));
+		});
 
 		return Promise.all(promises);
 	}
 
 	checkFeeds(guild) {
-		this.feeds.forEach(feed => feed.fetchLatest(guild));
+		this.feeds.forEach(feed => {
+			if (guild.channels.get(feed.channelID))
+				feed.fetchLatest(guild);
+		});
 	}
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index a36263b..01ba243 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.1.1",
+	"version": "3.1.2",
 	"main": "app/index.js",
 	"scripts": {
 		"postinstall": "cd ./discord-bot-core && npm install",